[libcxx] Avoid repeating the definition of std:: namespaces
This reduces code duplication a tiny bit. git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@344642 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@@ -464,14 +464,10 @@ typedef __char32_t char32_t;
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Inline namespaces are available in Clang regardless of C++ dialect.
|
// 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 _LIBCPP_END_NAMESPACE_STD } }
|
||||||
#define _VSTD std::_LIBCPP_NAMESPACE
|
#define _VSTD std::_LIBCPP_NAMESPACE
|
||||||
|
_LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD
|
||||||
namespace std {
|
|
||||||
inline namespace _LIBCPP_NAMESPACE {
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#if !defined(_LIBCPP_HAS_NO_ASAN) && !__has_feature(address_sanitizer)
|
#if !defined(_LIBCPP_HAS_NO_ASAN) && !__has_feature(address_sanitizer)
|
||||||
#define _LIBCPP_HAS_NO_ASAN
|
#define _LIBCPP_HAS_NO_ASAN
|
||||||
@@ -570,11 +566,7 @@ namespace std {
|
|||||||
#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 _LIBCPP_END_NAMESPACE_STD } }
|
||||||
#define _VSTD std::_LIBCPP_NAMESPACE
|
#define _VSTD std::_LIBCPP_NAMESPACE
|
||||||
|
_LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD
|
||||||
namespace std {
|
|
||||||
inline namespace _LIBCPP_NAMESPACE {
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#if !defined(_LIBCPP_HAS_NO_ASAN) && !defined(__SANITIZE_ADDRESS__)
|
#if !defined(_LIBCPP_HAS_NO_ASAN) && !defined(__SANITIZE_ADDRESS__)
|
||||||
#define _LIBCPP_HAS_NO_ASAN
|
#define _LIBCPP_HAS_NO_ASAN
|
||||||
@@ -614,9 +606,7 @@ namespace std {
|
|||||||
#define _LIBCPP_BEGIN_NAMESPACE_STD namespace std {
|
#define _LIBCPP_BEGIN_NAMESPACE_STD namespace std {
|
||||||
#define _LIBCPP_END_NAMESPACE_STD }
|
#define _LIBCPP_END_NAMESPACE_STD }
|
||||||
#define _VSTD std
|
#define _VSTD std
|
||||||
|
_LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD
|
||||||
namespace std {
|
|
||||||
}
|
|
||||||
|
|
||||||
#define _LIBCPP_WEAK
|
#define _LIBCPP_WEAK
|
||||||
|
|
||||||
@@ -645,14 +635,10 @@ namespace std {
|
|||||||
#define __MULTILOCALE_API
|
#define __MULTILOCALE_API
|
||||||
#endif
|
#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 _LIBCPP_END_NAMESPACE_STD } }
|
||||||
#define _VSTD std::_LIBCPP_NAMESPACE
|
#define _VSTD std::_LIBCPP_NAMESPACE
|
||||||
|
_LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD
|
||||||
namespace std {
|
|
||||||
inline namespace _LIBCPP_NAMESPACE {
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#define _LIBCPP_HAS_NO_ASAN
|
#define _LIBCPP_HAS_NO_ASAN
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user