Skip to content

Commit 226edd3

Browse files
huixie90huixie90
committed
CI
1 parent 8d157bf commit 226edd3

File tree

10 files changed

+302
-24
lines changed

10 files changed

+302
-24
lines changed

‎libcxx/include/__flat_map/flat_map.h‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@
5858
# pragma GCC system_header
5959
#endif
6060

61+
_LIBCPP_PUSH_MACROS
62+
#include <__undef_macros>
63+
6164
#if _LIBCPP_STD_VER >= 23
6265

6366
_LIBCPP_BEGIN_NAMESPACE_STD
@@ -289,7 +292,7 @@ class flat_map {
289292
_LIBCPP_HIDE_FROM_ABI flat_map(
290293
key_container_type __key_cont, mapped_container_type __mapped_cont, const key_compare& __comp = key_compare())
291294
: __containers_{.keys = std::move(__key_cont), .values = std::move(__mapped_cont)}, __compare_(__comp) {
292-
_LIBCPP_ASSERT_VALID_INPUT_RANGE(__containers.keys.size() == __containers.values.size(),
295+
_LIBCPP_ASSERT_VALID_INPUT_RANGE(__containers_.keys.size() == __containers_.values.size(),
293296
"flat_map keys and mapped containers have different size");
294297
__sort_and_unique();
295298
}
@@ -299,7 +302,7 @@ class flat_map {
299302
_LIBCPP_HIDE_FROM_ABI
300303
flat_map(const key_container_type& __key_cont, const mapped_container_type& __mapped_cont, const _Allocator& __alloc)
301304
: flat_map(__ctor_uses_allocator_tag{}, __alloc, __key_cont, __mapped_cont) {
302-
_LIBCPP_ASSERT_VALID_INPUT_RANGE(__containers.keys.size() == __containers.values.size(),
305+
_LIBCPP_ASSERT_VALID_INPUT_RANGE(__containers_.keys.size() == __containers_.values.size(),
303306
"flat_map keys and mapped containers have different size");
304307
__sort_and_unique();
305308
}
@@ -312,7 +315,7 @@ class flat_map {
312315
const key_compare& __comp,
313316
const _Allocator& __alloc)
314317
: flat_map(__ctor_uses_allocator_tag{}, __alloc, __key_cont, __mapped_cont, __comp) {
315-
_LIBCPP_ASSERT_VALID_INPUT_RANGE(__containers.keys.size() == __containers.values.size(),
318+
_LIBCPP_ASSERT_VALID_INPUT_RANGE(__containers_.keys.size() == __containers_.values.size(),
316319
"flat_map keys and mapped containers have different size");
317320
__sort_and_unique();
318321
}
@@ -323,10 +326,10 @@ class flat_map {
323326
mapped_container_type __mapped_cont,
324327
const key_compare& __comp = key_compare())
325328
: __containers_{.keys = std::move(__key_cont), .values = std::move(__mapped_cont)}, __compare_(__comp) {
326-
_LIBCPP_ASSERT_VALID_INPUT_RANGE(__containers.keys.size() == __containers.values.size(),
329+
_LIBCPP_ASSERT_VALID_INPUT_RANGE(__containers_.keys.size() == __containers_.values.size(),
327330
"flat_map keys and mapped containers have different size");
328331
_LIBCPP_ASSERT_SEMANTIC_REQUIREMENT(
329-
__is_sorted_and_unique(__containers.keys), "Either the key container is not sorted or it contains duplicates");
332+
__is_sorted_and_unique(__containers_.keys), "Either the key container is not sorted or it contains duplicates");
330333
}
331334

332335
template <class _Allocator>
@@ -337,10 +340,10 @@ class flat_map {
337340
const mapped_container_type& __mapped_cont,
338341
const _Allocator& __alloc)
339342
: flat_map(__ctor_uses_allocator_tag{}, __alloc, __key_cont, __mapped_cont) {
340-
_LIBCPP_ASSERT_VALID_INPUT_RANGE(__containers.keys.size() == __containers.values.size(),
343+
_LIBCPP_ASSERT_VALID_INPUT_RANGE(__containers_.keys.size() == __containers_.values.size(),
341344
"flat_map keys and mapped containers have different size");
342345
_LIBCPP_ASSERT_SEMANTIC_REQUIREMENT(
343-
__is_sorted_and_unique(__containers.keys), "Either the key container is not sorted or it contains duplicates");
346+
__is_sorted_and_unique(__containers_.keys), "Either the key container is not sorted or it contains duplicates");
344347
}
345348

346349
template <class _Allocator>
@@ -352,10 +355,10 @@ class flat_map {
352355
const key_compare& __comp,
353356
const _Allocator& __alloc)
354357
: flat_map(__ctor_uses_allocator_tag{}, __alloc, __key_cont, __mapped_cont, __comp) {
355-
_LIBCPP_ASSERT_VALID_INPUT_RANGE(__containers.keys.size() == __containers.values.size(),
358+
_LIBCPP_ASSERT_VALID_INPUT_RANGE(__containers_.keys.size() == __containers_.values.size(),
356359
"flat_map keys and mapped containers have different size");
357360
_LIBCPP_ASSERT_SEMANTIC_REQUIREMENT(
358-
__is_sorted_and_unique(__containers.keys), "Either the key container is not sorted or it contains duplicates");
361+
__is_sorted_and_unique(__containers_.keys), "Either the key container is not sorted or it contains duplicates");
359362
}
360363

361364
_LIBCPP_HIDE_FROM_ABI explicit flat_map(const key_compare& __comp) : __containers_(), __compare_(__comp) {}
@@ -512,7 +515,7 @@ class flat_map {
512515
}
513516

514517
_LIBCPP_HIDE_FROM_ABI reverse_iterator rbegin() noexcept { return reverse_iterator(end()); }
515-
_LIBCPP_HIDE_FROM_ABI const_reverse_iterator rbegin() const noexcept { const_reverse_iterator(end()); }
518+
_LIBCPP_HIDE_FROM_ABI const_reverse_iterator rbegin() const noexcept { return const_reverse_iterator(end()); }
516519
_LIBCPP_HIDE_FROM_ABI reverse_iterator rend() noexcept { return reverse_iterator(begin()); }
517520
_LIBCPP_HIDE_FROM_ABI const_reverse_iterator rend() const noexcept { return const_reverse_iterator(begin()); }
518521

@@ -982,7 +985,7 @@ class flat_map {
982985
ranges::stable_sort(__zv.begin() + __append_start_offset, __end, __compare_key);
983986
} else {
984987
_LIBCPP_ASSERT_SEMANTIC_REQUIREMENT(
985-
__is_sorted_and_unique(__containers.keys | views::drop(__append_start_offset)),
988+
__is_sorted_and_unique(__containers_.keys | views::drop(__append_start_offset)),
986989
"Either the key container is not sorted or it contains duplicates");
987990
}
988991
ranges::inplace_merge(__zv.begin(), __zv.begin() + __append_start_offset, __end, __compare_key);
@@ -1344,4 +1347,6 @@ _LIBCPP_END_NAMESPACE_STD
13441347

13451348
#endif // _LIBCPP_STD_VER >= 23
13461349

1350+
_LIBCPP_POP_MACROS
1351+
13471352
#endif // _LIBCPP___FLAT_MAP_FLAT_MAP_H

‎libcxx/test/libcxx/transitive_includes/cxx03.csv‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -682,6 +682,50 @@ filesystem typeinfo
682682
filesystem utility
683683
filesystem variant
684684
filesystem version
685+
flat_map algorithm
686+
flat_map array
687+
flat_map atomic
688+
flat_map bit
689+
flat_map cctype
690+
flat_map cerrno
691+
flat_map climits
692+
flat_map clocale
693+
flat_map cmath
694+
flat_map compare
695+
flat_map concepts
696+
flat_map cstdarg
697+
flat_map cstddef
698+
flat_map cstdint
699+
flat_map cstdio
700+
flat_map cstdlib
701+
flat_map cstring
702+
flat_map ctime
703+
flat_map cwchar
704+
flat_map cwctype
705+
flat_map exception
706+
flat_map initializer_list
707+
flat_map ios
708+
flat_map iosfwd
709+
flat_map iterator
710+
flat_map limits
711+
flat_map locale
712+
flat_map memory
713+
flat_map mutex
714+
flat_map new
715+
flat_map optional
716+
flat_map ratio
717+
flat_map stdexcept
718+
flat_map streambuf
719+
flat_map string
720+
flat_map string_view
721+
flat_map system_error
722+
flat_map tuple
723+
flat_map type_traits
724+
flat_map typeinfo
725+
flat_map utility
726+
flat_map variant
727+
flat_map vector
728+
flat_map version
685729
format algorithm
686730
format array
687731
format atomic

‎libcxx/test/libcxx/transitive_includes/cxx11.csv‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -682,6 +682,50 @@ filesystem typeinfo
682682
filesystem utility
683683
filesystem variant
684684
filesystem version
685+
flat_map algorithm
686+
flat_map array
687+
flat_map atomic
688+
flat_map bit
689+
flat_map cctype
690+
flat_map cerrno
691+
flat_map climits
692+
flat_map clocale
693+
flat_map cmath
694+
flat_map compare
695+
flat_map concepts
696+
flat_map cstdarg
697+
flat_map cstddef
698+
flat_map cstdint
699+
flat_map cstdio
700+
flat_map cstdlib
701+
flat_map cstring
702+
flat_map ctime
703+
flat_map cwchar
704+
flat_map cwctype
705+
flat_map exception
706+
flat_map initializer_list
707+
flat_map ios
708+
flat_map iosfwd
709+
flat_map iterator
710+
flat_map limits
711+
flat_map locale
712+
flat_map memory
713+
flat_map mutex
714+
flat_map new
715+
flat_map optional
716+
flat_map ratio
717+
flat_map stdexcept
718+
flat_map streambuf
719+
flat_map string
720+
flat_map string_view
721+
flat_map system_error
722+
flat_map tuple
723+
flat_map type_traits
724+
flat_map typeinfo
725+
flat_map utility
726+
flat_map variant
727+
flat_map vector
728+
flat_map version
685729
format algorithm
686730
format array
687731
format atomic

‎libcxx/test/libcxx/transitive_includes/cxx14.csv‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -700,6 +700,51 @@ filesystem typeinfo
700700
filesystem utility
701701
filesystem variant
702702
filesystem version
703+
flat_map algorithm
704+
flat_map array
705+
flat_map atomic
706+
flat_map bit
707+
flat_map cctype
708+
flat_map cerrno
709+
flat_map climits
710+
flat_map clocale
711+
flat_map cmath
712+
flat_map compare
713+
flat_map concepts
714+
flat_map cstdarg
715+
flat_map cstddef
716+
flat_map cstdint
717+
flat_map cstdio
718+
flat_map cstdlib
719+
flat_map cstring
720+
flat_map ctime
721+
flat_map cwchar
722+
flat_map cwctype
723+
flat_map exception
724+
flat_map execution
725+
flat_map initializer_list
726+
flat_map ios
727+
flat_map iosfwd
728+
flat_map iterator
729+
flat_map limits
730+
flat_map locale
731+
flat_map memory
732+
flat_map mutex
733+
flat_map new
734+
flat_map optional
735+
flat_map ratio
736+
flat_map stdexcept
737+
flat_map streambuf
738+
flat_map string
739+
flat_map string_view
740+
flat_map system_error
741+
flat_map tuple
742+
flat_map type_traits
743+
flat_map typeinfo
744+
flat_map utility
745+
flat_map variant
746+
flat_map vector
747+
flat_map version
703748
format algorithm
704749
format array
705750
format atomic

‎libcxx/test/libcxx/transitive_includes/cxx17.csv‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -706,6 +706,50 @@ filesystem utility
706706
filesystem variant
707707
filesystem vector
708708
filesystem version
709+
flat_map algorithm
710+
flat_map array
711+
flat_map atomic
712+
flat_map bit
713+
flat_map cctype
714+
flat_map cerrno
715+
flat_map climits
716+
flat_map clocale
717+
flat_map cmath
718+
flat_map compare
719+
flat_map concepts
720+
flat_map cstdarg
721+
flat_map cstddef
722+
flat_map cstdint
723+
flat_map cstdio
724+
flat_map cstdlib
725+
flat_map cstring
726+
flat_map ctime
727+
flat_map cwchar
728+
flat_map cwctype
729+
flat_map exception
730+
flat_map initializer_list
731+
flat_map ios
732+
flat_map iosfwd
733+
flat_map iterator
734+
flat_map limits
735+
flat_map locale
736+
flat_map memory
737+
flat_map mutex
738+
flat_map new
739+
flat_map optional
740+
flat_map ratio
741+
flat_map stdexcept
742+
flat_map streambuf
743+
flat_map string
744+
flat_map string_view
745+
flat_map system_error
746+
flat_map tuple
747+
flat_map type_traits
748+
flat_map typeinfo
749+
flat_map utility
750+
flat_map variant
751+
flat_map vector
752+
flat_map version
709753
format algorithm
710754
format array
711755
format atomic

‎libcxx/test/libcxx/transitive_includes/cxx20.csv‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -694,6 +694,50 @@ filesystem utility
694694
filesystem variant
695695
filesystem vector
696696
filesystem version
697+
flat_map algorithm
698+
flat_map array
699+
flat_map atomic
700+
flat_map bit
701+
flat_map cctype
702+
flat_map cerrno
703+
flat_map climits
704+
flat_map clocale
705+
flat_map cmath
706+
flat_map compare
707+
flat_map concepts
708+
flat_map cstdarg
709+
flat_map cstddef
710+
flat_map cstdint
711+
flat_map cstdio
712+
flat_map cstdlib
713+
flat_map cstring
714+
flat_map ctime
715+
flat_map cwchar
716+
flat_map cwctype
717+
flat_map exception
718+
flat_map initializer_list
719+
flat_map ios
720+
flat_map iosfwd
721+
flat_map iterator
722+
flat_map limits
723+
flat_map locale
724+
flat_map memory
725+
flat_map mutex
726+
flat_map new
727+
flat_map optional
728+
flat_map ratio
729+
flat_map stdexcept
730+
flat_map streambuf
731+
flat_map string
732+
flat_map string_view
733+
flat_map system_error
734+
flat_map tuple
735+
flat_map type_traits
736+
flat_map typeinfo
737+
flat_map utility
738+
flat_map variant
739+
flat_map vector
740+
flat_map version
697741
format algorithm
698742
format array
699743
format atomic

‎libcxx/test/libcxx/transitive_includes/cxx23.csv‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -381,6 +381,31 @@ filesystem string_view
381381
filesystem tuple
382382
filesystem typeinfo
383383
filesystem version
384+
flat_map array
385+
flat_map cctype
386+
flat_map cerrno
387+
flat_map climits
388+
flat_map clocale
389+
flat_map compare
390+
flat_map cstddef
391+
flat_map cstdint
392+
flat_map cstdio
393+
flat_map cstdlib
394+
flat_map cstring
395+
flat_map cwchar
396+
flat_map cwctype
397+
flat_map initializer_list
398+
flat_map iosfwd
399+
flat_map limits
400+
flat_map new
401+
flat_map optional
402+
flat_map stdexcept
403+
flat_map string
404+
flat_map string_view
405+
flat_map tuple
406+
flat_map typeinfo
407+
flat_map vector
408+
flat_map version
384409
format array
385410
format cctype
386411
format cerrno

0 commit comments

Comments
 (0)