Skip to content

Commit 22f5f28

Browse files
committed
Try to fix merge conflict fixes
1 parent 6e98c2b commit 22f5f28

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

libcxx/docs/Status/Cxx23Papers.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"`P2259R1 <https://wg21.link/P2259R1>`__","Repairing input range adaptors and counted_iterator","2021-02 (Virtual)","","",""
1313
"","","","","",""
1414
"`P0401R6 <https://wg21.link/P0401R6>`__","Providing size feedback in the Allocator interface","2021-06 (Virtual)","|Complete|","15.0",""
15-
"`P0448R4 <https://wg21.link/P0448R4>`__","LWG","A ``strstream`` replacement using ``span<charT>`` as buffer","June 2021","|Partial|","20.0"
15+
"`P0448R4 <https://wg21.link/P0448R4>`__","A ``strstream`` replacement using ``span<charT>`` as buffer","June 2021","|Partial|","20.0",""
1616
"`P1132R8 <https://wg21.link/P1132R8>`__","out_ptr - a scalable output pointer abstraction","2021-06 (Virtual)","|Complete|","19.0",""
1717
"`P1328R1 <https://wg21.link/P1328R1>`__","Making std::type_info::operator== constexpr","2021-06 (Virtual)","|Complete|","17.0",""
1818
"`P1425R4 <https://wg21.link/P1425R4>`__","Iterators pair constructors for stack and queue","2021-06 (Virtual)","|Complete|","14.0",""

libcxx/include/module.modulemap

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1815,6 +1815,13 @@ module std [system] {
18151815
export *
18161816
}
18171817

1818+
module spanstream {
1819+
module fwd { header "__fwd/spanstream.h" }
1820+
1821+
header "spanstream"
1822+
export *
1823+
}
1824+
18181825
module sstream {
18191826
module fwd { header "__fwd/sstream.h" }
18201827

0 commit comments

Comments
 (0)