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;
621
621
inline namespace _LIBCPP_ABI_NAMESPACE {
622
622
# define _LIBCPP_END_NAMESPACE_STD }} _LIBCPP_POP_EXTENSION_DIAGNOSTICS
623
623
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
624
628
# define _LIBCPP_BEGIN_NAMESPACE_FILESYSTEM _LIBCPP_BEGIN_NAMESPACE_STD \
625
629
inline namespace __fs { namespace filesystem {
626
630
627
631
# define _LIBCPP_END_NAMESPACE_FILESYSTEM }} _LIBCPP_END_NAMESPACE_STD
632
+ #endif
633
+
628
634
// clang-format on
629
635
630
636
# if __has_attribute(__enable_if__)
Original file line number Diff line number Diff line change 89
89
// requires code not to make these assumptions.
90
90
# define _LIBCPP_ABI_USE_WRAP_ITER_IN_STD_ARRAY
91
91
# 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
92
94
#elif _LIBCPP_ABI_VERSION == 1
93
95
# if !(defined(_LIBCPP_OBJECT_FORMAT_COFF) || defined(_LIBCPP_OBJECT_FORMAT_XCOFF))
94
96
// Enable compiling copies of now inline methods into the dylib to support
Original file line number Diff line number Diff line change 30
30
#endif
31
31
32
32
using namespace std ::chrono;
33
- namespace fs = std::__fs:: filesystem;
33
+ namespace fs = std::filesystem;
34
34
using fs::file_time_type;
35
35
using fs::detail::time_util;
36
36
You can’t perform that action at this time.
0 commit comments