Skip to content

Commit ceeded7

Browse files
arobenkoarobenko
committed
Reverting changes to 170f294 
1 parent dac9673 commit ceeded7

4 files changed

Lines changed: 11 additions & 23 deletions

File tree

‎.github/workflows/actions_build.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ on:
99

1010
jobs:
1111
build_gcc_ubuntu_22_04:
12-
if: false
1312
runs-on: ubuntu-22.04
1413
strategy:
1514
fail-fast: false
@@ -51,7 +50,6 @@ jobs:
5150
run: ctest -V
5251

5352
build_gcc_ubuntu_24_04:
54-
if: false
5553
runs-on: ubuntu-24.04
5654
strategy:
5755
fail-fast: false
@@ -101,7 +99,6 @@ jobs:
10199
run: make doc_comms
102100

103101
build_clang_ubuntu_22_04:
104-
if: false
105102
runs-on: ubuntu-22.04
106103
strategy:
107104
fail-fast: false
@@ -143,7 +140,6 @@ jobs:
143140
run: ctest -V
144141

145142
build_clang_ubuntu_24_04:
146-
if: false
147143
runs-on: ubuntu-24.04
148144
strategy:
149145
fail-fast: false

‎include/comms/CompileControl.h‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,6 @@
8888
#define COMMS_IS_CLANG_16_OR_ABOVE (COMMS_IS_CLANG && (__clang_major__ >= 16))
8989
#define COMMS_IS_CLANG_18_OR_BELOW (COMMS_IS_CLANG && (__clang_major__ <= 18))
9090
#define COMMS_IS_CLANG_19_OR_BELOW (COMMS_IS_CLANG && (__clang_major__ <= 19))
91-
#define COMMS_IS_MSVC_2025 (COMMS_IS_MSVC && (_MSC_VER >= 1940) && (_MSC_VER < 1950))
92-
#define COMMS_IS_MSVC_2025_OR_BELOW (COMMS_IS_MSVC && (_MSC_VER < 1950))
93-
#define COMMS_IS_MSVC_2022 (COMMS_IS_MSVC && (_MSC_VER >= 1930) && (_MSC_VER < 1940))
9491
#define COMMS_IS_MSVC_2019 (COMMS_IS_MSVC && (_MSC_VER >= 1920) && (_MSC_VER < 1930))
9592
#define COMMS_IS_MSVC_2019_OR_BELOW (COMMS_IS_MSVC && (_MSC_VER < 1930))
9693
#define COMMS_IS_MSVC_2017_OR_BELOW (COMMS_IS_MSVC && (_MSC_VER < 1920))
@@ -105,12 +102,7 @@
105102
#define COMMS_IS_CPP20 (__cplusplus >= 202002L)
106103
#define COMMS_IS_CPP23 (__cplusplus >= 202302L)
107104

108-
#if COMMS_IS_MSVC_2025_OR_BELOW
109-
#undef COMMS_IS_CPP23
110-
#define COMMS_IS_CPP23 (__cplusplus >= 202003L)
111-
#endif
112-
113-
#if COMMS_IS_MSVC_2019_OR_BELOW
105+
#if COMMS_IS_MSVC_2019_OR_BELOW // Visual Studio 2019
114106
#undef COMMS_IS_CPP20
115107
#define COMMS_IS_CPP20 (__cplusplus >= 201704L)
116108
#endif

‎include/comms/details/fields_access.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,18 @@
2929
#else // #ifdef COMMS_MUST_DEFINE_BASE
3030
#define COMMS_FIELD_VALUE_ACCESS_FUNC FUNC_AUTO_REF_RETURN(value, decltype(comms::field::toFieldBase(*this).value()))
3131
#define COMMS_FIELD_VALUE_ACCESS_CONST_FUNC FUNC_AUTO_REF_RETURN_CONST(value, decltype(comms::field::toFieldBase(*this).value()))
32-
#define COMMS_ACCESS_MEMBER_FIELD_FUNC(T_, t_, n_) FUNC_AUTO_REF_RETURN(COMMS_CONCATENATE(field_, n_), decltype(static_cast<std::size_t>(std::get<COMMS_CONCATENATE(FieldIdx_, n_))>(t_)))
33-
#define COMMS_ACCESS_MEMBER_FIELD_CONST_FUNC(T_, t_, n_) FUNC_AUTO_REF_RETURN_CONST(COMMS_CONCATENATE(field_, n_), decltype(std::get<static_cast<std::size_t>(COMMS_CONCATENATE(FieldIdx_, n_))>(t_)))
32+
#define COMMS_ACCESS_MEMBER_FIELD_FUNC(T_, t_, n_) FUNC_AUTO_REF_RETURN(COMMS_CONCATENATE(field_, n_), decltype(std::get<COMMS_CONCATENATE(FieldIdx_, n_)>(t_)))
33+
#define COMMS_ACCESS_MEMBER_FIELD_CONST_FUNC(T_, t_, n_) FUNC_AUTO_REF_RETURN_CONST(COMMS_CONCATENATE(field_, n_), decltype(std::get<COMMS_CONCATENATE(FieldIdx_, n_)>(t_)))
3434
#define COMMS_MSG_FIELDS_ACCESS_FUNC FUNC_AUTO_REF_RETURN(fields, decltype(comms::toMessageBase(*this).fields()))
3535
#define COMMS_MSG_FIELDS_ACCESS_CONST_FUNC FUNC_AUTO_REF_RETURN_CONST(fields, decltype(comms::toMessageBase(*this).fields()))
3636
#endif // #ifdef COMMS_MUST_DEFINE_BASE
3737

3838
#define COMMS_FIELD_ACC_FUNC(T_, t_, n_) \
3939
COMMS_ACCESS_MEMBER_FIELD_FUNC(T_, t_, n_) {\
40-
return std::get<static_cast<std::size_t>(COMMS_CONCATENATE(FieldIdx_, n_))>(t_); \
40+
return std::get<COMMS_CONCATENATE(FieldIdx_, n_)>(t_); \
4141
} \
4242
COMMS_ACCESS_MEMBER_FIELD_CONST_FUNC(T_, t_, n_) {\
43-
return std::get<static_cast<std::size_t>(COMMS_CONCATENATE(FieldIdx_, n_))>(t_); \
43+
return std::get<COMMS_CONCATENATE(FieldIdx_, n_)>(t_); \
4444
}
4545

4646
#define COMMS_FIELD_ACC_FUNC_1(T_, t_, n_) COMMS_FIELD_ACC_FUNC(T_, t_, n_)
@@ -353,10 +353,10 @@
353353

354354
#define COMMS_FIELD_ACC_FUNC_NOTEMPLATE(n_) \
355355
typename std::tuple_element<COMMS_CONCATENATE(FieldIdx_, n_), ValueType>::type& COMMS_CONCATENATE(field_, n_)() {\
356-
return std::get<static_cast<std::size_t>(COMMS_CONCATENATE(FieldIdx_, n_))>(value()); \
356+
return std::get<COMMS_CONCATENATE(FieldIdx_, n_)>(value()); \
357357
} \
358358
const typename std::tuple_element<COMMS_CONCATENATE(FieldIdx_, n_), ValueType>::type& COMMS_CONCATENATE(field_, n_)() const {\
359-
return std::get<static_cast<std::size_t>(COMMS_CONCATENATE(FieldIdx_, n_))>(value()); \
359+
return std::get<COMMS_CONCATENATE(FieldIdx_, n_)>(value()); \
360360
}
361361

362362
#define COMMS_FIELD_ACC_FUNC_NOTEMPLATE_1(n_) COMMS_FIELD_ACC_FUNC_NOTEMPLATE(n_)

‎include/comms/details/transport_fields_access.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,18 @@
2525
const typename Base::TransportFields& transportFields() const
2626

2727
#else // #ifdef COMMS_MUST_DEFINE_BASE
28-
#define COMMS_ACCESS_TRANSPORT_FIELD_FUNC(T_, t_, n_) FUNC_AUTO_REF_RETURN(COMMS_CONCATENATE(transportField_, n_), decltype(std::get<static_cast<std::size_t>(COMMS_CONCATENATE(TransportFieldIdx_, n_))>(t_)))
29-
#define COMMS_ACCESS_TRANSPORT_FIELD_CONST_FUNC(T_, t_, n_) FUNC_AUTO_REF_RETURN_CONST(COMMS_CONCATENATE(transportField_, n_), decltype(std::get<static_cast<std::size_t>(COMMS_CONCATENATE(TransportFieldIdx_, n_))>(t_)))
28+
#define COMMS_ACCESS_TRANSPORT_FIELD_FUNC(T_, t_, n_) FUNC_AUTO_REF_RETURN(COMMS_CONCATENATE(transportField_, n_), decltype(std::get<COMMS_CONCATENATE(TransportFieldIdx_, n_)>(t_)))
29+
#define COMMS_ACCESS_TRANSPORT_FIELD_CONST_FUNC(T_, t_, n_) FUNC_AUTO_REF_RETURN_CONST(COMMS_CONCATENATE(transportField_, n_), decltype(std::get<COMMS_CONCATENATE(TransportFieldIdx_, n_)>(t_)))
3030
#define COMMS_MSG_TRANSPORT_FIELDS_ACCESS_FUNC FUNC_AUTO_REF_RETURN(transportFields, decltype(comms::toMessage(*this).transportFields()))
3131
#define COMMS_MSG_TRANSPORT_FIELDS_ACCESS_CONST_FUNC FUNC_AUTO_REF_RETURN_CONST(transportFields, decltype(comms::toMessage(*this).transportFields()))
3232
#endif // #ifdef COMMS_MUST_DEFINE_BASE
3333

3434
#define COMMS_TRANSPORT_FIELD_ACC_FUNC(T_, t_, n_) \
3535
COMMS_ACCESS_TRANSPORT_FIELD_FUNC(T_, t_, n_) {\
36-
return std::get<static_cast<std::size_t>(COMMS_CONCATENATE(TransportFieldIdx_, n_))>(t_); \
36+
return std::get<COMMS_CONCATENATE(TransportFieldIdx_, n_)>(t_); \
3737
} \
3838
COMMS_ACCESS_TRANSPORT_FIELD_CONST_FUNC(T_, t_, n_) {\
39-
return std::get<static_cast<std::size_t>(COMMS_CONCATENATE(TransportFieldIdx_, n_))>(t_); \
39+
return std::get<COMMS_CONCATENATE(TransportFieldIdx_, n_)>(t_); \
4040
}
4141

4242
#define COMMS_TRANSPORT_FIELD_ACC_FUNC_1(T_, t_, n_) COMMS_TRANSPORT_FIELD_ACC_FUNC(T_, t_, n_)

0 commit comments

Comments
 (0)