File tree Expand file tree Collapse file tree 4 files changed +14
-8
lines changed Expand file tree Collapse file tree 4 files changed +14
-8
lines changed Original file line number Diff line number Diff line change @@ -732,10 +732,8 @@ jobs:
732
732
-DCMAKE_CXX_COMPILER=g++-4.8 \
733
733
-DCMAKE_C_COMPILER=gcc-4.8 \
734
734
-DCPPTRACE_WERROR_BUILD=On \
735
- -DCPPTRACE_STD_FORMAT=Off \
736
- -DCPPTRACE_BUILD_TESTING=On
735
+ -DCPPTRACE_STD_FORMAT=Off
737
736
ninja
738
- ./unittest
739
737
740
738
unittest-windows-32-bit :
741
739
runs-on : windows-2022
Original file line number Diff line number Diff line change @@ -17,7 +17,7 @@ namespace detail {
17
17
template <
18
18
typename T,
19
19
typename std::enable_if<
20
- std::is_standard_layout<T>::value && std:: is_trivially_copyable<T>::value && !is_span<T>::value,
20
+ std::is_standard_layout<T>::value && is_trivially_copyable<T>::value && !is_span<T>::value,
21
21
int
22
22
>::type = 0
23
23
>
@@ -33,7 +33,7 @@ namespace detail {
33
33
template <
34
34
typename T,
35
35
typename std::enable_if<
36
- std::is_standard_layout<T>::value && std:: is_trivially_copyable<T>::value,
36
+ std::is_standard_layout<T>::value && is_trivially_copyable<T>::value,
37
37
int
38
38
>::type = 0
39
39
>
Original file line number Diff line number Diff line change @@ -85,7 +85,7 @@ namespace detail {
85
85
template <
86
86
typename T,
87
87
typename std::enable_if<
88
- std::is_standard_layout<T>::value && std:: is_trivially_copyable<T>::value && !is_span<T>::value,
88
+ std::is_standard_layout<T>::value && is_trivially_copyable<T>::value && !is_span<T>::value,
89
89
int
90
90
>::type = 0
91
91
>
Original file line number Diff line number Diff line change @@ -165,11 +165,19 @@ namespace detail {
165
165
return value < 10 ? 1 : 1 + n_digits (value / 10 );
166
166
}
167
167
168
+ #if defined(__GNUC__) && (__GNUC__ < 5) && !defined(__clang__)
169
+ template <typename T>
170
+ using is_trivially_copyable = std::is_trivial<T>;
171
+ #else
172
+ template <typename T>
173
+ using is_trivially_copyable = std::is_trivially_copyable<T>;
174
+ #endif
175
+
168
176
// TODO: Re-evaluate use of off_t
169
177
template <
170
178
typename T,
171
179
typename std::enable_if<
172
- std::is_standard_layout<T>::value && std:: is_trivially_copyable<T>::value,
180
+ std::is_standard_layout<T>::value && is_trivially_copyable<T>::value,
173
181
int
174
182
>::type = 0
175
183
>
@@ -235,7 +243,7 @@ namespace detail {
235
243
// <= 19.23 msvc also appears to fail (but for a different reason https://godbolt.org/z/6Y5EvdWPK)
236
244
// <= 19.39 msvc also has trouble with it for different reasons https://godbolt.org/z/aPPPT7z3z
237
245
typename std::enable_if<
238
- std::is_standard_layout<T>::value && std:: is_trivially_copyable<T>::value,
246
+ std::is_standard_layout<T>::value && is_trivially_copyable<T>::value,
239
247
int
240
248
>::type = 0 ,
241
249
typename std::enable_if<
You can’t perform that action at this time.
0 commit comments