diff options
| author | Eric Fiselier <eric@efcs.ca> | 2018-07-27 06:12:46 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2018-07-27 06:12:46 +0000 |
| commit | 7e850a8da4f7a653733f9183c3623354265251b7 (patch) | |
| tree | e30354a69a69248026b1d70be5de366143edf297 | |
| parent | bc3f4035c39e6b86262a4e87253fad0281c4e89a (diff) | |
Move Filesystem namespace definition out of a clang specific ifdef block.
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@338103 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | include/__config | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/include/__config b/include/__config index 4b17fb5e7..139c19971 100644 --- a/include/__config +++ b/include/__config @@ -474,19 +474,6 @@ namespace std { } } -#if _LIBCPP_STD_VER >= 17 -#define _LIBCPP_BEGIN_NAMESPACE_FILESYSTEM \ - _LIBCPP_BEGIN_NAMESPACE_STD inline namespace __fs { namespace filesystem { -#else -#define _LIBCPP_BEGIN_NAMESPACE_FILESYSTEM \ - _LIBCPP_BEGIN_NAMESPACE_STD namespace __fs { namespace filesystem { -#endif - -#define _LIBCPP_END_NAMESPACE_FILESYSTEM \ - _LIBCPP_END_NAMESPACE_STD } } - -#define _VSTD_FS _VSTD::__fs::filesystem - #if !defined(_LIBCPP_HAS_NO_ASAN) && !__has_feature(address_sanitizer) #define _LIBCPP_HAS_NO_ASAN #endif @@ -659,6 +646,20 @@ namespace std { #endif // _LIBCPP_COMPILER_[CLANG|GCC|MSVC|IBM] +#if _LIBCPP_STD_VER >= 17 +#define _LIBCPP_BEGIN_NAMESPACE_FILESYSTEM \ + _LIBCPP_BEGIN_NAMESPACE_STD inline namespace __fs { namespace filesystem { +#else +#define _LIBCPP_BEGIN_NAMESPACE_FILESYSTEM \ + _LIBCPP_BEGIN_NAMESPACE_STD namespace __fs { namespace filesystem { +#endif + +#define _LIBCPP_END_NAMESPACE_FILESYSTEM \ + _LIBCPP_END_NAMESPACE_STD } } + +#define _VSTD_FS _VSTD::__fs::filesystem + + #if defined(_LIBCPP_OBJECT_FORMAT_COFF) #ifdef _DLL |