| commit | 0949eedbd621bc1611266fb180d9a356ee1eaf9f | [log] [tgz] |
|---|---|---|
| author | Howard Hinnant <hhinnant@apple.com> | Thu Jun 30 21:18:19 2011 +0000 |
| committer | Howard Hinnant <hhinnant@apple.com> | Thu Jun 30 21:18:19 2011 +0000 |
| tree | 32980a76874f97a8dfca6329b5b3eb9213a3be60 | |
| parent | d318d49e5c74179d0f4f9a79ab0f54a9531c5513 [diff] [blame] |
_STD -> _VSTD to avoid macro clash on windows git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@134190 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/cstddef b/include/cstddef index 53ef272..b851ea0 100644 --- a/include/cstddef +++ b/include/cstddef
@@ -82,7 +82,7 @@ inline _LIBCPP_ALWAYS_INLINE nullptr_t __get_nullptr_t() {return nullptr_t(0);} -#define nullptr _STD::__get_nullptr_t() +#define nullptr _VSTD::__get_nullptr_t() #endif // _LIBCPP_HAS_NO_NULLPTR