@@ -28,7 +28,6 @@ set(ABSL_INTERNAL_DLL_FILES
28
28
"base/internal/low_level_scheduling.h"
29
29
"base/internal/nullability_impl.h"
30
30
"base/internal/per_thread_tls.h"
31
- "base/internal/prefetch.h"
32
31
"base/prefetch.h"
33
32
"base/internal/pretty_function.h"
34
33
"base/internal/raw_logging.cc"
@@ -44,7 +43,6 @@ set(ABSL_INTERNAL_DLL_FILES
44
43
"base/internal/spinlock_wait.h"
45
44
"base/internal/sysinfo.cc"
46
45
"base/internal/sysinfo.h"
47
- "base/internal/thread_annotations.h"
48
46
"base/internal/thread_identity.cc"
49
47
"base/internal/thread_identity.h"
50
48
"base/internal/throw_delegate.cc"
@@ -57,6 +55,7 @@ set(ABSL_INTERNAL_DLL_FILES
57
55
"base/log_severity.cc"
58
56
"base/log_severity.h"
59
57
"base/macros.h"
58
+ "base/no_destructor.h"
60
59
"base/nullability.h"
61
60
"base/optimization.h"
62
61
"base/options.h"
@@ -77,7 +76,6 @@ set(ABSL_INTERNAL_DLL_FILES
77
76
"container/internal/common_policy_traits.h"
78
77
"container/internal/compressed_tuple.h"
79
78
"container/internal/container_memory.h"
80
- "container/internal/counting_allocator.h"
81
79
"container/internal/hash_function_defaults.h"
82
80
"container/internal/hash_policy_traits.h"
83
81
"container/internal/hashtable_debug.h"
@@ -109,7 +107,7 @@ set(ABSL_INTERNAL_DLL_FILES
109
107
"crc/internal/crc_x86_arm_combined.cc"
110
108
"crc/internal/crc_memcpy_fallback.cc"
111
109
"crc/internal/crc_memcpy.h"
112
- "crc/internal/crc_memcpy_x86_64 .cc"
110
+ "crc/internal/crc_memcpy_x86_arm_combined .cc"
113
111
"crc/internal/crc_non_temporal_memcpy.cc"
114
112
"crc/internal/crc_x86_arm_combined.cc"
115
113
"crc/internal/non_temporal_arm_intrinsics.h"
@@ -141,6 +139,7 @@ set(ABSL_INTERNAL_DLL_FILES
141
139
"functional/function_ref.h"
142
140
"functional/internal/any_invocable.h"
143
141
"functional/internal/function_ref.h"
142
+ "functional/overload.h"
144
143
"hash/hash.h"
145
144
"hash/internal/city.h"
146
145
"hash/internal/city.cc"
@@ -151,6 +150,7 @@ set(ABSL_INTERNAL_DLL_FILES
151
150
"hash/internal/low_level_hash.cc"
152
151
"log/absl_check.h"
153
152
"log/absl_log.h"
153
+ "log/absl_vlog_is_on.h"
154
154
"log/check.h"
155
155
"log/die_if_null.cc"
156
156
"log/die_if_null.h"
@@ -163,6 +163,8 @@ set(ABSL_INTERNAL_DLL_FILES
163
163
"log/internal/conditions.cc"
164
164
"log/internal/conditions.h"
165
165
"log/internal/config.h"
166
+ "log/internal/fnmatch.h"
167
+ "log/internal/fnmatch.cc"
166
168
"log/internal/globals.cc"
167
169
"log/internal/globals.h"
168
170
"log/internal/log_format.cc"
@@ -179,6 +181,8 @@ set(ABSL_INTERNAL_DLL_FILES
179
181
"log/internal/proto.cc"
180
182
"log/internal/strip.h"
181
183
"log/internal/structured.h"
184
+ "log/internal/vlog_config.cc"
185
+ "log/internal/vlog_config.h"
182
186
"log/internal/voidify.h"
183
187
"log/initialize.cc"
184
188
"log/initialize.h"
@@ -190,6 +194,7 @@ set(ABSL_INTERNAL_DLL_FILES
190
194
"log/log_sink_registry.h"
191
195
"log/log_streamer.h"
192
196
"log/structured.h"
197
+ "log/vlog_is_on.h"
193
198
"memory/memory.h"
194
199
"meta/type_traits.h"
195
200
"numeric/bits.h"
@@ -250,6 +255,7 @@ set(ABSL_INTERNAL_DLL_FILES
250
255
"random/uniform_real_distribution.h"
251
256
"random/zipf_distribution.h"
252
257
"status/internal/status_internal.h"
258
+ "status/internal/status_internal.cc"
253
259
"status/internal/statusor_internal.h"
254
260
"status/status.h"
255
261
"status/status.cc"
@@ -261,6 +267,7 @@ set(ABSL_INTERNAL_DLL_FILES
261
267
"strings/ascii.h"
262
268
"strings/charconv.cc"
263
269
"strings/charconv.h"
270
+ "strings/charset.h"
264
271
"strings/cord.cc"
265
272
"strings/cord.h"
266
273
"strings/cord_analysis.cc"
@@ -287,9 +294,6 @@ set(ABSL_INTERNAL_DLL_FILES
287
294
"strings/internal/cord_rep_consume.h"
288
295
"strings/internal/cord_rep_consume.cc"
289
296
"strings/internal/cord_rep_flat.h"
290
- "strings/internal/cord_rep_ring.cc"
291
- "strings/internal/cord_rep_ring.h"
292
- "strings/internal/cord_rep_ring_reader.h"
293
297
"strings/internal/cordz_functions.cc"
294
298
"strings/internal/cordz_functions.h"
295
299
"strings/internal/cordz_handle.cc"
@@ -308,6 +312,8 @@ set(ABSL_INTERNAL_DLL_FILES
308
312
"strings/internal/stringify_sink.h"
309
313
"strings/internal/stringify_sink.cc"
310
314
"strings/internal/has_absl_stringify.h"
315
+ "strings/has_absl_stringify.h"
316
+ "strings/has_ostream_operator.h"
311
317
"strings/match.cc"
312
318
"strings/match.h"
313
319
"strings/numbers.cc"
@@ -325,7 +331,6 @@ set(ABSL_INTERNAL_DLL_FILES
325
331
"strings/strip.h"
326
332
"strings/substitute.cc"
327
333
"strings/substitute.h"
328
- "strings/internal/char_map.h"
329
334
"strings/internal/escaping.h"
330
335
"strings/internal/escaping.cc"
331
336
"strings/internal/memutil.cc"
@@ -421,11 +426,6 @@ set(ABSL_INTERNAL_DLL_FILES
421
426
"types/bad_variant_access.cc"
422
427
"types/bad_variant_access.h"
423
428
"types/compare.h"
424
- "types/internal/conformance_aliases.h"
425
- "types/internal/conformance_archetype.h"
426
- "types/internal/conformance_profile.h"
427
- "types/internal/parentheses.h"
428
- "types/internal/transform_args.h"
429
429
"types/internal/variant.h"
430
430
"types/optional.h"
431
431
"types/internal/optional.h"
@@ -627,17 +627,32 @@ include(CheckCXXSourceCompiles)
627
627
check_cxx_source_compiles(
628
628
[==[
629
629
#ifdef _MSC_VER
630
- # if _MSVC_LANG < 201700L
630
+ # if _MSVC_LANG < 201703L
631
631
# error "The compiler defaults or is configured for C++ < 17"
632
632
# endif
633
- #elif __cplusplus < 201700L
633
+ #elif __cplusplus < 201703L
634
634
# error "The compiler defaults or is configured for C++ < 17"
635
635
#endif
636
636
int main() { return 0; }
637
637
]==]
638
638
ABSL_INTERNAL_AT_LEAST_CXX17)
639
639
640
- if (ABSL_INTERNAL_AT_LEAST_CXX17)
640
+ check_cxx_source_compiles(
641
+ [==[
642
+ #ifdef _MSC_VER
643
+ # if _MSVC_LANG < 202002L
644
+ # error "The compiler defaults or is configured for C++ < 20"
645
+ # endif
646
+ #elif __cplusplus < 202002L
647
+ # error "The compiler defaults or is configured for C++ < 20"
648
+ #endif
649
+ int main() { return 0; }
650
+ ]==]
651
+ ABSL_INTERNAL_AT_LEAST_CXX20)
652
+
653
+ if (ABSL_INTERNAL_AT_LEAST_CXX20)
654
+ set (ABSL_INTERNAL_CXX_STD_FEATURE cxx_std_20)
655
+ elseif (ABSL_INTERNAL_AT_LEAST_CXX17)
641
656
set (ABSL_INTERNAL_CXX_STD_FEATURE cxx_std_17)
642
657
else ()
643
658
set (ABSL_INTERNAL_CXX_STD_FEATURE cxx_std_14)
@@ -807,8 +822,8 @@ Cflags: -I\${includedir}${PC_CFLAGS}\n")
807
822
808
823
if (ABSL_PROPAGATE_CXX_STD)
809
824
# Abseil libraries require C++14 as the current minimum standard. When
810
- # compiled with C++17 (either because it is the compiler's default or
811
- # explicitly requested), then Abseil requires C++17 .
825
+ # compiled with a higher minimum (either because it is the compiler's
826
+ # default or explicitly requested), then Abseil requires that standard .
812
827
target_compile_features (${_dll} PUBLIC ${ABSL_INTERNAL_CXX_STD_FEATURE} )
813
828
endif ()
814
829
0 commit comments