diff options
| author | Howard Hinnant <hhinnant@apple.com> | 2012-10-30 19:06:59 +0000 |
|---|---|---|
| committer | Howard Hinnant <hhinnant@apple.com> | 2012-10-30 19:06:59 +0000 |
| commit | 9c0df1416f2cec1cc6cce797d18ddc5e50b64797 (patch) | |
| tree | eb6e95d6e44d1f4a88c0a17c509cc100949931f7 /include/cstddef | |
| parent | eac2a01863a90185dfa1151ce902203be2c68955 (diff) | |
Rename uses of _ and __ because these are getting stepped on by macros from other system code.
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@167038 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include/cstddef')
| -rw-r--r-- | include/cstddef | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/cstddef b/include/cstddef index 4b01be26a..246708973 100644 --- a/include/cstddef +++ b/include/cstddef @@ -58,12 +58,12 @@ typedef long double max_align_t; struct _LIBCPP_VISIBLE nullptr_t { - void* _; + void* __lx; struct __nat {int __for_bool_;}; - _LIBCPP_ALWAYS_INLINE _LIBCPP_CONSTEXPR nullptr_t() : _(0) {} - _LIBCPP_ALWAYS_INLINE _LIBCPP_CONSTEXPR nullptr_t(int __nat::*) : _(0) {} + _LIBCPP_ALWAYS_INLINE _LIBCPP_CONSTEXPR nullptr_t() : __lx(0) {} + _LIBCPP_ALWAYS_INLINE _LIBCPP_CONSTEXPR nullptr_t(int __nat::*) : __lx(0) {} _LIBCPP_ALWAYS_INLINE _LIBCPP_CONSTEXPR operator int __nat::*() const {return 0;} |