Skip to content

Commit 4084df0

Browse files
committed
[libcxx] Avoid repeating the definition of std:: namespaces
This reduces code duplication a tiny bit. llvm-svn: 344642
1 parent 7833b88 commit 4084df0

File tree

1 file changed

+6
-20
lines changed

1 file changed

+6
-20
lines changed

libcxx/include/__config

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -464,14 +464,10 @@ typedef __char32_t char32_t;
464464
#endif
465465

466466
// Inline namespaces are available in Clang regardless of C++ dialect.
467-
#define _LIBCPP_BEGIN_NAMESPACE_STD namespace std {inline namespace _LIBCPP_NAMESPACE {
467+
#define _LIBCPP_BEGIN_NAMESPACE_STD namespace std { inline namespace _LIBCPP_NAMESPACE {
468468
#define _LIBCPP_END_NAMESPACE_STD } }
469469
#define _VSTD std::_LIBCPP_NAMESPACE
470-
471-
namespace std {
472-
inline namespace _LIBCPP_NAMESPACE {
473-
}
474-
}
470+
_LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD
475471

476472
#if !defined(_LIBCPP_HAS_NO_ASAN) && !__has_feature(address_sanitizer)
477473
#define _LIBCPP_HAS_NO_ASAN
@@ -570,11 +566,7 @@ namespace std {
570566
#define _LIBCPP_BEGIN_NAMESPACE_STD namespace std { inline namespace _LIBCPP_NAMESPACE {
571567
#define _LIBCPP_END_NAMESPACE_STD } }
572568
#define _VSTD std::_LIBCPP_NAMESPACE
573-
574-
namespace std {
575-
inline namespace _LIBCPP_NAMESPACE {
576-
}
577-
}
569+
_LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD
578570

579571
#if !defined(_LIBCPP_HAS_NO_ASAN) && !defined(__SANITIZE_ADDRESS__)
580572
#define _LIBCPP_HAS_NO_ASAN
@@ -614,9 +606,7 @@ namespace std {
614606
#define _LIBCPP_BEGIN_NAMESPACE_STD namespace std {
615607
#define _LIBCPP_END_NAMESPACE_STD }
616608
#define _VSTD std
617-
618-
namespace std {
619-
}
609+
_LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD
620610

621611
#define _LIBCPP_WEAK
622612

@@ -645,14 +635,10 @@ namespace std {
645635
#define __MULTILOCALE_API
646636
#endif
647637

648-
#define _LIBCPP_BEGIN_NAMESPACE_STD namespace std {inline namespace _LIBCPP_NAMESPACE {
638+
#define _LIBCPP_BEGIN_NAMESPACE_STD namespace std { inline namespace _LIBCPP_NAMESPACE {
649639
#define _LIBCPP_END_NAMESPACE_STD } }
650640
#define _VSTD std::_LIBCPP_NAMESPACE
651-
652-
namespace std {
653-
inline namespace _LIBCPP_NAMESPACE {
654-
}
655-
}
641+
_LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD
656642

657643
#define _LIBCPP_HAS_NO_ASAN
658644

0 commit comments

Comments
 (0)