_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/ext/hash_map b/include/ext/hash_map index 9a0b9ee..49c8d11 100644 --- a/include/ext/hash_map +++ b/include/ext/hash_map
@@ -341,9 +341,9 @@ void operator()(pointer __p) { if (__second_constructed) - __alloc_traits::destroy(__na_, _STD::addressof(__p->__value_.second)); + __alloc_traits::destroy(__na_, _VSTD::addressof(__p->__value_.second)); if (__first_constructed) - __alloc_traits::destroy(__na_, _STD::addressof(__p->__value_.first)); + __alloc_traits::destroy(__na_, _VSTD::addressof(__p->__value_.first)); if (__p) __alloc_traits::deallocate(__na_, __p, 1); } @@ -666,11 +666,11 @@ { __node_allocator& __na = __table_.__node_alloc(); __node_holder __h(__node_traits::allocate(__na, 1), _D(__na)); - __node_traits::construct(__na, _STD::addressof(__h->__value_.first), __k); + __node_traits::construct(__na, _VSTD::addressof(__h->__value_.first), __k); __h.get_deleter().__first_constructed = true; - __node_traits::construct(__na, _STD::addressof(__h->__value_.second)); + __node_traits::construct(__na, _VSTD::addressof(__h->__value_.second)); __h.get_deleter().__second_constructed = true; - return _STD::move(__h); + return _VSTD::move(__h); } template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc> @@ -963,9 +963,9 @@ { _EqRng __xeq = __x.equal_range(__i->first); _EqRng __yeq = __y.equal_range(__i->first); - if (_STD::distance(__xeq.first, __xeq.second) != - _STD::distance(__yeq.first, __yeq.second) || - !_STD::is_permutation(__xeq.first, __xeq.second, __yeq.first)) + if (_VSTD::distance(__xeq.first, __xeq.second) != + _VSTD::distance(__yeq.first, __yeq.second) || + !_VSTD::is_permutation(__xeq.first, __xeq.second, __yeq.first)) return false; __i = __xeq.second; }
diff --git a/include/ext/hash_set b/include/ext/hash_set index 1f8712b..e205db8 100644 --- a/include/ext/hash_set +++ b/include/ext/hash_set
@@ -627,9 +627,9 @@ { _EqRng __xeq = __x.equal_range(*__i); _EqRng __yeq = __y.equal_range(*__i); - if (_STD::distance(__xeq.first, __xeq.second) != - _STD::distance(__yeq.first, __yeq.second) || - !_STD::is_permutation(__xeq.first, __xeq.second, __yeq.first)) + if (_VSTD::distance(__xeq.first, __xeq.second) != + _VSTD::distance(__yeq.first, __yeq.second) || + !_VSTD::is_permutation(__xeq.first, __xeq.second, __yeq.first)) return false; __i = __xeq.second; }