Skip to content

[libc++] Properly guard flat_map includes based on C++ version #119227

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 11, 2024
+8 −114
Merged

[libc++] Properly guard flat_map includes based on C++ version #119227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions libcxx/include/flat_map
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,15 @@ namespace std {
*/

#if 0
#else // 0
# include <__assert> // all public C++ headers provide the assertion handler
#else // 0
# include <__config>
# include <__flat_map/flat_map.h>
# include <__flat_map/sorted_unique.h>

# if _LIBCPP_STD_VER >= 23
# include <__flat_map/flat_map.h>
# include <__flat_map/sorted_unique.h>
# endif

// for feature-test macros
# include <version>

// standard required includes
Expand Down
22 changes: 0 additions & 22 deletions libcxx/test/libcxx/transitive_includes/cxx03.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -674,35 +674,13 @@ filesystem typeinfo
filesystem utility
filesystem variant
filesystem version
flat_map atomic
flat_map cctype
flat_map climits
flat_map cmath
flat_map compare
flat_map concepts
flat_map cstddef
flat_map cstdint
flat_map cstdio
flat_map cstdlib
flat_map cstring
flat_map ctime
flat_map cwchar
flat_map cwctype
flat_map exception
flat_map initializer_list
flat_map iosfwd
flat_map iterator
flat_map limits
flat_map memory
flat_map new
flat_map optional
flat_map ratio
flat_map stdexcept
flat_map tuple
flat_map type_traits
flat_map typeinfo
flat_map utility
flat_map variant
flat_map version
format algorithm
format array
Expand Down
22 changes: 0 additions & 22 deletions libcxx/test/libcxx/transitive_includes/cxx11.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -674,35 +674,13 @@ filesystem typeinfo
filesystem utility
filesystem variant
filesystem version
flat_map atomic
flat_map cctype
flat_map climits
flat_map cmath
flat_map compare
flat_map concepts
flat_map cstddef
flat_map cstdint
flat_map cstdio
flat_map cstdlib
flat_map cstring
flat_map ctime
flat_map cwchar
flat_map cwctype
flat_map exception
flat_map initializer_list
flat_map iosfwd
flat_map iterator
flat_map limits
flat_map memory
flat_map new
flat_map optional
flat_map ratio
flat_map stdexcept
flat_map tuple
flat_map type_traits
flat_map typeinfo
flat_map utility
flat_map variant
flat_map version
format algorithm
format array
Expand Down
22 changes: 0 additions & 22 deletions libcxx/test/libcxx/transitive_includes/cxx14.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -692,35 +692,13 @@ filesystem typeinfo
filesystem utility
filesystem variant
filesystem version
flat_map atomic
flat_map cctype
flat_map climits
flat_map cmath
flat_map compare
flat_map concepts
flat_map cstddef
flat_map cstdint
flat_map cstdio
flat_map cstdlib
flat_map cstring
flat_map ctime
flat_map cwchar
flat_map cwctype
flat_map exception
flat_map initializer_list
flat_map iosfwd
flat_map iterator
flat_map limits
flat_map memory
flat_map new
flat_map optional
flat_map ratio
flat_map stdexcept
flat_map tuple
flat_map type_traits
flat_map typeinfo
flat_map utility
flat_map variant
flat_map version
format algorithm
format array
Expand Down
22 changes: 0 additions & 22 deletions libcxx/test/libcxx/transitive_includes/cxx17.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -701,35 +701,13 @@ filesystem utility
filesystem variant
filesystem vector
filesystem version
flat_map atomic
flat_map cctype
flat_map climits
flat_map cmath
flat_map compare
flat_map concepts
flat_map cstddef
flat_map cstdint
flat_map cstdio
flat_map cstdlib
flat_map cstring
flat_map ctime
flat_map cwchar
flat_map cwctype
flat_map exception
flat_map initializer_list
flat_map iosfwd
flat_map iterator
flat_map limits
flat_map memory
flat_map new
flat_map optional
flat_map ratio
flat_map stdexcept
flat_map tuple
flat_map type_traits
flat_map typeinfo
flat_map utility
flat_map variant
flat_map version
format algorithm
format array
Expand Down
22 changes: 0 additions & 22 deletions libcxx/test/libcxx/transitive_includes/cxx20.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -697,35 +697,13 @@ filesystem utility
filesystem variant
filesystem vector
filesystem version
flat_map atomic
flat_map cctype
flat_map climits
flat_map cmath
flat_map compare
flat_map concepts
flat_map cstddef
flat_map cstdint
flat_map cstdio
flat_map cstdlib
flat_map cstring
flat_map ctime
flat_map cwchar
flat_map cwctype
flat_map exception
flat_map initializer_list
flat_map iosfwd
flat_map iterator
flat_map limits
flat_map memory
flat_map new
flat_map optional
flat_map ratio
flat_map stdexcept
flat_map tuple
flat_map type_traits
flat_map typeinfo
flat_map utility
flat_map variant
flat_map version
format algorithm
format array
Expand Down
Loading