Skip to content

Commit efc60dc

Browse files
authored
[libc++] Reenable codecvt in the dylib. (#73679)
The header is used in the dylib, this is not an issue at the moment since the dylib is built using C++23 but it would be when building with C++26. Post release comments in #72496 seem to indicate this removal is an issue for Fuchsia.
1 parent 61aef97 commit efc60dc

File tree

5 files changed

+14
-2
lines changed

5 files changed

+14
-2
lines changed

libcxx/include/codecvt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class codecvt_utf8_utf16
6363
# pragma GCC system_header
6464
#endif
6565

66-
#if _LIBCPP_STD_VER < 26 || defined(_LIBCPP_ENABLE_CXX26_REMOVED_CODECVT)
66+
#if _LIBCPP_STD_VER < 26 || defined(_LIBCPP_BUILDING_LIBRARY) || defined(_LIBCPP_ENABLE_CXX26_REMOVED_CODECVT)
6767

6868
_LIBCPP_BEGIN_NAMESPACE_STD
6969

@@ -555,7 +555,7 @@ _LIBCPP_SUPPRESS_DEPRECATED_POP
555555

556556
_LIBCPP_END_NAMESPACE_STD
557557

558-
#endif // _LIBCPP_STD_VER < 26 || defined(_LIBCPP_ENABLE_CXX26_REMOVED_CODECVT)
558+
#endif // _LIBCPP_STD_VER < 26 || defined(_LIBCPP_BUILDING_LIBRARY) || defined(_LIBCPP_ENABLE_CXX26_REMOVED_CODECVT)
559559

560560
#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
561561
# include <atomic>

libcxx/test/libcxx/input.output/file.streams/fstreams/fstream.cons/wchar_pointer.pass.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
// REQUIRES: windows
1818
// UNSUPPORTED: no-wide-characters
1919

20+
// TODO: This should not be necessary
21+
// ADDITIONAL_COMPILE_FLAGS:-D_LIBCPP_ENABLE_CXX26_REMOVED_CODECVT
22+
2023
#include <fstream>
2124
#include <cassert>
2225
#include "test_macros.h"

libcxx/test/libcxx/input.output/file.streams/fstreams/fstream.members/open_wchar_pointer.pass.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
// REQUIRES: windows
1818
// UNSUPPORTED: no-wide-characters
1919

20+
// TODO: This should not be necessary
21+
// ADDITIONAL_COMPILE_FLAGS:-D_LIBCPP_ENABLE_CXX26_REMOVED_CODECVT
22+
2023
#include <fstream>
2124
#include <cassert>
2225
#include "test_macros.h"

libcxx/test/libcxx/input.output/file.streams/fstreams/ofstream.cons/wchar_pointer.pass.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
// REQUIRES: windows
1818
// UNSUPPORTED: no-wide-characters
1919

20+
// TODO: This should not be necessary
21+
// ADDITIONAL_COMPILE_FLAGS:-D_LIBCPP_ENABLE_CXX26_REMOVED_CODECVT
22+
2023
#include <fstream>
2124
#include <cassert>
2225
#include "test_macros.h"

libcxx/test/libcxx/input.output/file.streams/fstreams/ofstream.members/open_wchar_pointer.pass.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
// REQUIRES: windows
1818
// UNSUPPORTED: no-wide-characters
1919

20+
// TODO: This should not be necessary
21+
// ADDITIONAL_COMPILE_FLAGS:-D_LIBCPP_ENABLE_CXX26_REMOVED_CODECVT
22+
2023
#include <fstream>
2124
#include <cassert>
2225
#include "test_macros.h"

0 commit comments

Comments
 (0)