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 | 8e4a1690bf75ef59de9b6867bd1fff4cfc1b4c5b (patch) | |
| tree | 3396f997b20e126f8020ae03ca17d734a51ea741 /libcxx/include | |
| parent | e9bdc5f1d810f40aeccdafc1df100dc9a1cdc1d5 (diff) | |
| download | bcm5719-llvm-8e4a1690bf75ef59de9b6867bd1fff4cfc1b4c5b.tar.gz bcm5719-llvm-8e4a1690bf75ef59de9b6867bd1fff4cfc1b4c5b.zip | |
Move Filesystem namespace definition out of a clang specific ifdef block.
llvm-svn: 338103
Diffstat (limited to 'libcxx/include')
| -rw-r--r-- | libcxx/include/__config | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/libcxx/include/__config b/libcxx/include/__config index 4b17fb5e77e..139c199710a 100644 --- a/libcxx/include/__config +++ b/libcxx/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 |
