Skip to content

Commit a6ba74e

Browse files
committed
[libcxx] Move the private header __std_stream into the src subdir
This header isn't used by any public header, so there shouldn't be any need to install it or treat it as a heder. Once it's part of the src subdirectory, I guess one could consider giving it a more traditional name too. Differential Revision: https://reviews.llvm.org/D147855
1 parent 9c8264f commit a6ba74e

File tree

8 files changed

+2
-10
lines changed

8 files changed

+2
-10
lines changed

libcxx/include/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -568,7 +568,6 @@ set(files
568568
__ranges/views.h
569569
__ranges/zip_view.h
570570
__split_buffer
571-
__std_stream
572571
__string/char_traits.h
573572
__string/constexpr_c_functions.h
574573
__string/extern_template_lists.h

libcxx/include/libcxx.imp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
{ include: [ "<__node_handle>", "private", "<unordered_set>", "public" ] },
99
{ include: [ "<__split_buffer>", "private", "<deque>", "public" ] },
1010
{ include: [ "<__split_buffer>", "private", "<vector>", "public" ] },
11-
{ include: [ "<__std_stream>", "private", "<iostream>", "public" ] },
1211
{ include: [ "<__threading_support>", "private", "<atomic>", "public" ] },
1312
{ include: [ "<__threading_support>", "private", "<mutex>", "public" ] },
1413
{ include: [ "<__threading_support>", "private", "<semaphore>", "public" ] },

libcxx/include/module.modulemap.in

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1725,10 +1725,6 @@ module std [system] {
17251725
module __mbstate_t { private header "__mbstate_t.h" export * }
17261726
module __node_handle { private header "__node_handle" export * }
17271727
module __split_buffer { private header "__split_buffer" export * }
1728-
module __std_stream {
1729-
@requires_LIBCXX_ENABLE_LOCALIZATION@
1730-
private header "__std_stream" export *
1731-
}
17321728
module __threading_support { header "__threading_support" export * }
17331729
module __tree { header "__tree" export * }
17341730
module __undef_macros { header "__undef_macros" export * }
File renamed without changes.

libcxx/src/iostream.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//===----------------------------------------------------------------------===//
88

99
#include <__locale>
10-
#include <__std_stream>
10+
#include "__std_stream"
1111
#include <new>
1212
#include <string>
1313

libcxx/test/libcxx/private_headers.verify.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -599,7 +599,6 @@ END-SCRIPT
599599
#include <__ranges/views.h> // expected-error@*:* {{use of private header from outside its module: '__ranges/views.h'}}
600600
#include <__ranges/zip_view.h> // expected-error@*:* {{use of private header from outside its module: '__ranges/zip_view.h'}}
601601
#include <__split_buffer> // expected-error@*:* {{use of private header from outside its module: '__split_buffer'}}
602-
#include <__std_stream> // expected-error@*:* {{use of private header from outside its module: '__std_stream'}}
603602
#include <__string/char_traits.h> // expected-error@*:* {{use of private header from outside its module: '__string/char_traits.h'}}
604603
#include <__string/constexpr_c_functions.h> // expected-error@*:* {{use of private header from outside its module: '__string/constexpr_c_functions.h'}}
605604
#include <__string/extern_template_lists.h> // expected-error@*:* {{use of private header from outside its module: '__string/extern_template_lists.h'}}

libcxx/utils/data/ignore_format.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,6 @@ libcxx/include/stdexcept
592592
libcxx/include/stdint.h
593593
libcxx/include/stdio.h
594594
libcxx/include/stdlib.h
595-
libcxx/include/__std_stream
596595
libcxx/include/streambuf
597596
libcxx/include/string
598597
libcxx/include/__string/char_traits.h
@@ -806,6 +805,7 @@ libcxx/src/random_shuffle.cpp
806805
libcxx/src/regex.cpp
807806
libcxx/src/shared_mutex.cpp
808807
libcxx/src/stdexcept.cpp
808+
libcxx/src/__std_stream
809809
libcxx/src/string.cpp
810810
libcxx/src/strstream.cpp
811811
libcxx/src/support/ibm/mbsnrtowcs.cpp

libcxx/utils/generate_iwyu_mapping.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ def generate_map(include):
5353
elif i == '__mutex_base': continue
5454
elif i == '__node_handle': public = ['map', 'set', 'unordered_map', 'unordered_set']
5555
elif i == '__split_buffer': public = ['deque', 'vector']
56-
elif i == '__std_stream': public = ['iostream']
5756
elif i == '__threading_support': public = ['atomic', 'mutex', 'semaphore', 'thread']
5857
elif i == '__tree': public = ['map', 'set']
5958
elif i == '__undef_macros': continue

0 commit comments

Comments
 (0)