File tree Expand file tree Collapse file tree 3 files changed +9
-1
lines changed
test/libcxx/input.output/filesystems Expand file tree Collapse file tree 3 files changed +9
-1
lines changed Original file line number Diff line number Diff line change @@ -621,10 +621,16 @@ typedef __char32_t char32_t;
621621 inline namespace _LIBCPP_ABI_NAMESPACE {
622622# define _LIBCPP_END_NAMESPACE_STD }} _LIBCPP_POP_EXTENSION_DIAGNOSTICS
623623
624+ #ifdef _LIBCPP_ABI_NO_FILESYSTEM_INLINE_NAMESPACE
625+ # define _LIBCPP_BEGIN_NAMESPACE_FILESYSTEM _LIBCPP_BEGIN_NAMESPACE_STD namespace filesystem {
626+ # define _LIBCPP_END_NAMESPACE_FILESYSTEM } _LIBCPP_END_NAMESPACE_STD
627+ #else
624628# define _LIBCPP_BEGIN_NAMESPACE_FILESYSTEM _LIBCPP_BEGIN_NAMESPACE_STD \
625629 inline namespace __fs { namespace filesystem {
626630
627631# define _LIBCPP_END_NAMESPACE_FILESYSTEM }} _LIBCPP_END_NAMESPACE_STD
632+ #endif
633+
628634// clang-format on
629635
630636# if __has_attribute(__enable_if__)
Original file line number Diff line number Diff line change 8989// requires code not to make these assumptions.
9090# define _LIBCPP_ABI_USE_WRAP_ITER_IN_STD_ARRAY
9191# define _LIBCPP_ABI_USE_WRAP_ITER_IN_STD_STRING_VIEW
92+ // Dont' add an inline namespace for `std::filesystem`
93+ # define _LIBCPP_ABI_NO_FILESYSTEM_INLINE_NAMESPACE
9294#elif _LIBCPP_ABI_VERSION == 1
9395# if !(defined(_LIBCPP_OBJECT_FORMAT_COFF) || defined(_LIBCPP_OBJECT_FORMAT_XCOFF))
9496// Enable compiling copies of now inline methods into the dylib to support
Original file line number Diff line number Diff line change 3030#endif
3131
3232using namespace std ::chrono;
33- namespace fs = std::__fs:: filesystem;
33+ namespace fs = std::filesystem;
3434using fs::file_time_type;
3535using fs::detail::time_util;
3636
You can’t perform that action at this time.
0 commit comments