diff options
| author | Howard Hinnant <hhinnant@apple.com> | 2011-06-30 21:18:19 +0000 |
|---|---|---|
| committer | Howard Hinnant <hhinnant@apple.com> | 2011-06-30 21:18:19 +0000 |
| commit | ce48a1137d56d368828d360e5f2a8162bac6517c (patch) | |
| tree | ec224d56b3d3a54fafbd14126993b38671f4ebec /libcxx/include/ext | |
| parent | 070f96c567f7b0b3a0aa03178d2b6f05cdb2e447 (diff) | |
| download | bcm5719-llvm-ce48a1137d56d368828d360e5f2a8162bac6517c.tar.gz bcm5719-llvm-ce48a1137d56d368828d360e5f2a8162bac6517c.zip | |
_STD -> _VSTD to avoid macro clash on windows
llvm-svn: 134190
Diffstat (limited to 'libcxx/include/ext')
| -rw-r--r-- | libcxx/include/ext/hash_map | 16 | ||||
| -rw-r--r-- | libcxx/include/ext/hash_set | 6 |
2 files changed, 11 insertions, 11 deletions
diff --git a/libcxx/include/ext/hash_map b/libcxx/include/ext/hash_map index 9a0b9ee19ee..49c8d11c491 100644 --- a/libcxx/include/ext/hash_map +++ b/libcxx/include/ext/hash_map @@ -341,9 +341,9 @@ public: 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 @@ hash_map<_Key, _Tp, _Hash, _Pred, _Alloc>::__construct_node(const key_type& __k) { __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 @@ operator==(const hash_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __x, { _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/libcxx/include/ext/hash_set b/libcxx/include/ext/hash_set index 1f8712bce4f..e205db81caa 100644 --- a/libcxx/include/ext/hash_set +++ b/libcxx/include/ext/hash_set @@ -627,9 +627,9 @@ operator==(const hash_multiset<_Value, _Hash, _Pred, _Alloc>& __x, { _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; } |
