diff options
| author | Howard Hinnant <hhinnant@apple.com> | 2011-06-05 13:00:46 +0000 |
|---|---|---|
| committer | Howard Hinnant <hhinnant@apple.com> | 2011-06-05 13:00:46 +0000 |
| commit | c28dbeee5231f573bc6402cf5e6b88e6f939609c (patch) | |
| tree | 7e1bbaecd00795bdaa362660092ccd7244794f38 /include/cstddef | |
| parent | 58cd8231d80bb14c5e78fbedc00af191134cc99d (diff) | |
Move nullptr_t to unversioned namespace: Sean Hunt
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@132665 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include/cstddef')
| -rw-r--r-- | include/cstddef | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/include/cstddef b/include/cstddef index 3da9659ad..53ef27250 100644 --- a/include/cstddef +++ b/include/cstddef @@ -84,12 +84,17 @@ inline _LIBCPP_ALWAYS_INLINE nullptr_t __get_nullptr_t() {return nullptr_t(0);} #define nullptr _STD::__get_nullptr_t() -#else // _LIBCPP_HAS_NO_NULLPTR - -typedef decltype(nullptr) nullptr_t; - #endif // _LIBCPP_HAS_NO_NULLPTR _LIBCPP_END_NAMESPACE_STD +#ifndef _LIBCPP_HAS_NO_NULLPTR + +namespace std +{ + typedef decltype(nullptr) nullptr_t; +} + +#endif // _LIBCPP_HAS_NO_NULLPTR + #endif // _LIBCPP_CSTDDEF |