[cfe-commits] [libcxx] r132665 - /libcxx/trunk/include/cstddef

[Howard Hinnant]

Author: hhinnant
Date: Sun Jun  5 08:00:46 2011
New Revision: 132665

URL: http://llvm.org/viewvc/llvm-project?rev=132665&view=rev
Log:
Move nullptr_t to unversioned namespace:  Sean Hunt

Modified:
    libcxx/trunk/include/cstddef

Modified: libcxx/trunk/include/cstddef
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/cstddef?rev=132665&r1=132664&r2=132665&view=diff
==============================================================================
--- libcxx/trunk/include/cstddef (original)
+++ libcxx/trunk/include/cstddef Sun Jun  5 08:00:46 2011
@@ -84,12 +84,17 @@
 
 #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