Skip to content

Commit 608c27b

Browse files
committed
[libc++] Remove transitive <locale> include from <vector>
1 parent 2acf302 commit 608c27b

File tree

9 files changed

+47
-4
lines changed

9 files changed

+47
-4
lines changed

libcxx/include/__format/formatter_bool.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include <__utility/unreachable.h>
2323

2424
#ifndef _LIBCPP_HAS_NO_LOCALIZATION
25-
# include <locale>
25+
# include <__locale>
2626
#endif
2727

2828
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)

libcxx/include/__format/formatter_integral.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#include <string_view>
3333

3434
#ifndef _LIBCPP_HAS_NO_LOCALIZATION
35-
# include <locale>
35+
# include <__locale>
3636
#endif
3737

3838
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)

libcxx/include/vector

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2972,6 +2972,7 @@ _LIBCPP_POP_MACROS
29722972
# include <atomic>
29732973
# include <concepts>
29742974
# include <cstdlib>
2975+
# include <locale>
29752976
# include <type_traits>
29762977
# include <typeinfo>
29772978
# include <utility>

libcxx/test/libcxx/transitive_includes/cxx11.csv

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -839,13 +839,17 @@ system_error type_traits
839839
system_error version
840840
thread array
841841
thread atomic
842+
thread cctype
842843
thread cerrno
843844
thread chrono
845+
thread clocale
844846
thread compare
845847
thread cstddef
846848
thread cstdint
849+
thread cstdlib
847850
thread cstring
848851
thread ctime
852+
thread cwchar
849853
thread functional
850854
thread iosfwd
851855
thread limits
@@ -954,8 +958,10 @@ variant version
954958
vector algorithm
955959
vector array
956960
vector atomic
961+
vector cctype
957962
vector cerrno
958963
vector climits
964+
vector clocale
959965
vector compare
960966
vector concepts
961967
vector cstddef

libcxx/test/libcxx/transitive_includes/cxx14.csv

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -841,13 +841,17 @@ system_error type_traits
841841
system_error version
842842
thread array
843843
thread atomic
844+
thread cctype
844845
thread cerrno
845846
thread chrono
847+
thread clocale
846848
thread compare
847849
thread cstddef
848850
thread cstdint
851+
thread cstdlib
849852
thread cstring
850853
thread ctime
854+
thread cwchar
851855
thread functional
852856
thread iosfwd
853857
thread limits
@@ -956,8 +960,10 @@ variant version
956960
vector algorithm
957961
vector array
958962
vector atomic
963+
vector cctype
959964
vector cerrno
960965
vector climits
966+
vector clocale
961967
vector compare
962968
vector concepts
963969
vector cstddef

libcxx/test/libcxx/transitive_includes/cxx17.csv

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -841,13 +841,17 @@ system_error type_traits
841841
system_error version
842842
thread array
843843
thread atomic
844+
thread cctype
844845
thread cerrno
845846
thread chrono
847+
thread clocale
846848
thread compare
847849
thread cstddef
848850
thread cstdint
851+
thread cstdlib
849852
thread cstring
850853
thread ctime
854+
thread cwchar
851855
thread functional
852856
thread iosfwd
853857
thread limits
@@ -956,8 +960,10 @@ variant version
956960
vector algorithm
957961
vector array
958962
vector atomic
963+
vector cctype
959964
vector cerrno
960965
vector climits
966+
vector clocale
961967
vector compare
962968
vector concepts
963969
vector cstddef

libcxx/test/libcxx/transitive_includes/cxx20.csv

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -846,12 +846,16 @@ system_error type_traits
846846
system_error version
847847
thread array
848848
thread atomic
849+
thread cctype
849850
thread cerrno
851+
thread clocale
850852
thread compare
851853
thread cstddef
852854
thread cstdint
855+
thread cstdlib
853856
thread cstring
854857
thread ctime
858+
thread cwchar
855859
thread functional
856860
thread iosfwd
857861
thread limits
@@ -960,8 +964,10 @@ variant version
960964
vector algorithm
961965
vector array
962966
vector atomic
967+
vector cctype
963968
vector cerrno
964969
vector climits
970+
vector clocale
965971
vector compare
966972
vector concepts
967973
vector cstddef

libcxx/test/libcxx/transitive_includes/cxx23.csv

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -585,11 +585,16 @@ system_error string
585585
system_error version
586586
thread array
587587
thread atomic
588+
thread cctype
588589
thread cerrno
590+
thread clocale
589591
thread compare
590592
thread cstddef
591593
thread cstdint
594+
thread cstdlib
595+
thread cstring
592596
thread ctime
597+
thread cwchar
593598
thread initializer_list
594599
thread iosfwd
595600
thread limits
@@ -601,6 +606,7 @@ thread stdexcept
601606
thread string
602607
thread string_view
603608
thread tuple
609+
thread typeinfo
604610
thread version
605611
tuple compare
606612
tuple cstddef
@@ -658,20 +664,23 @@ variant new
658664
variant tuple
659665
variant version
660666
vector array
667+
vector cctype
661668
vector cerrno
662669
vector climits
670+
vector clocale
663671
vector compare
664672
vector cstddef
665673
vector cstdint
674+
vector cstdlib
666675
vector cstring
667676
vector cwchar
668677
vector initializer_list
669678
vector iosfwd
670679
vector limits
671-
vector locale
672680
vector new
673681
vector stdexcept
674682
vector string
675683
vector string_view
676684
vector tuple
685+
vector typeinfo
677686
vector version

libcxx/test/libcxx/transitive_includes/cxx26.csv

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -585,11 +585,16 @@ system_error string
585585
system_error version
586586
thread array
587587
thread atomic
588+
thread cctype
588589
thread cerrno
590+
thread clocale
589591
thread compare
590592
thread cstddef
591593
thread cstdint
594+
thread cstdlib
595+
thread cstring
592596
thread ctime
597+
thread cwchar
593598
thread initializer_list
594599
thread iosfwd
595600
thread limits
@@ -601,6 +606,7 @@ thread stdexcept
601606
thread string
602607
thread string_view
603608
thread tuple
609+
thread typeinfo
604610
thread version
605611
tuple compare
606612
tuple cstddef
@@ -658,20 +664,23 @@ variant new
658664
variant tuple
659665
variant version
660666
vector array
667+
vector cctype
661668
vector cerrno
662669
vector climits
670+
vector clocale
663671
vector compare
664672
vector cstddef
665673
vector cstdint
674+
vector cstdlib
666675
vector cstring
667676
vector cwchar
668677
vector initializer_list
669678
vector iosfwd
670679
vector limits
671-
vector locale
672680
vector new
673681
vector stdexcept
674682
vector string
675683
vector string_view
676684
vector tuple
685+
vector typeinfo
677686
vector version

0 commit comments

Comments
 (0)