forked from OSchip/llvm-project
Move nullptr_t to unversioned namespace: Sean Hunt
llvm-svn: 132665
This commit is contained in:
parent
c7ca587512
commit
32208bde75
|
@ -84,12 +84,17 @@ inline _LIBCPP_ALWAYS_INLINE nullptr_t __get_nullptr_t() {return nullptr_t(0);}
|
||||||
|
|
||||||
#define nullptr _STD::__get_nullptr_t()
|
#define nullptr _STD::__get_nullptr_t()
|
||||||
|
|
||||||
#else // _LIBCPP_HAS_NO_NULLPTR
|
|
||||||
|
|
||||||
typedef decltype(nullptr) nullptr_t;
|
|
||||||
|
|
||||||
#endif // _LIBCPP_HAS_NO_NULLPTR
|
#endif // _LIBCPP_HAS_NO_NULLPTR
|
||||||
|
|
||||||
_LIBCPP_END_NAMESPACE_STD
|
_LIBCPP_END_NAMESPACE_STD
|
||||||
|
|
||||||
|
#ifndef _LIBCPP_HAS_NO_NULLPTR
|
||||||
|
|
||||||
|
namespace std
|
||||||
|
{
|
||||||
|
typedef decltype(nullptr) nullptr_t;
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif // _LIBCPP_HAS_NO_NULLPTR
|
||||||
|
|
||||||
#endif // _LIBCPP_CSTDDEF
|
#endif // _LIBCPP_CSTDDEF
|
||||||
|
|
Loading…
Reference in New Issue