diff options
| author | Louis Dionne <ldionne@apple.com> | 2018-10-16 20:02:59 +0000 |
|---|---|---|
| committer | Louis Dionne <ldionne@apple.com> | 2018-10-16 20:02:59 +0000 |
| commit | 4084df00402bc9b69b15b56cbdd8f5f8be81cc0a (patch) | |
| tree | 1c9f757199e5825543c43331a4d38b160d6edd4b | |
| parent | 7833b88ad882079efaf17958872120c051cbb886 (diff) | |
| download | bcm5719-llvm-4084df00402bc9b69b15b56cbdd8f5f8be81cc0a.tar.gz bcm5719-llvm-4084df00402bc9b69b15b56cbdd8f5f8be81cc0a.zip | |
[libcxx] Avoid repeating the definition of std:: namespaces
This reduces code duplication a tiny bit.
llvm-svn: 344642
| -rw-r--r-- | libcxx/include/__config | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/libcxx/include/__config b/libcxx/include/__config index 3e7d9a51ace..51068b33be9 100644 --- a/libcxx/include/__config +++ b/libcxx/include/__config @@ -464,14 +464,10 @@ typedef __char32_t char32_t; #endif // Inline namespaces are available in Clang regardless of C++ dialect. -#define _LIBCPP_BEGIN_NAMESPACE_STD namespace std {inline namespace _LIBCPP_NAMESPACE { +#define _LIBCPP_BEGIN_NAMESPACE_STD namespace std { inline namespace _LIBCPP_NAMESPACE { #define _LIBCPP_END_NAMESPACE_STD } } #define _VSTD std::_LIBCPP_NAMESPACE - -namespace std { - inline namespace _LIBCPP_NAMESPACE { - } -} +_LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD #if !defined(_LIBCPP_HAS_NO_ASAN) && !__has_feature(address_sanitizer) #define _LIBCPP_HAS_NO_ASAN @@ -570,11 +566,7 @@ namespace std { #define _LIBCPP_BEGIN_NAMESPACE_STD namespace std { inline namespace _LIBCPP_NAMESPACE { #define _LIBCPP_END_NAMESPACE_STD } } #define _VSTD std::_LIBCPP_NAMESPACE - -namespace std { - inline namespace _LIBCPP_NAMESPACE { - } -} +_LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD #if !defined(_LIBCPP_HAS_NO_ASAN) && !defined(__SANITIZE_ADDRESS__) #define _LIBCPP_HAS_NO_ASAN @@ -614,9 +606,7 @@ namespace std { #define _LIBCPP_BEGIN_NAMESPACE_STD namespace std { #define _LIBCPP_END_NAMESPACE_STD } #define _VSTD std - -namespace std { -} +_LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD #define _LIBCPP_WEAK @@ -645,14 +635,10 @@ namespace std { #define __MULTILOCALE_API #endif -#define _LIBCPP_BEGIN_NAMESPACE_STD namespace std {inline namespace _LIBCPP_NAMESPACE { +#define _LIBCPP_BEGIN_NAMESPACE_STD namespace std { inline namespace _LIBCPP_NAMESPACE { #define _LIBCPP_END_NAMESPACE_STD } } #define _VSTD std::_LIBCPP_NAMESPACE - -namespace std { - inline namespace _LIBCPP_NAMESPACE { - } -} +_LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD #define _LIBCPP_HAS_NO_ASAN |
