diff options
| author | Howard Hinnant <hhinnant@apple.com> | 2011-07-01 01:18:19 +0400 |
|---|---|---|
| committer | Howard Hinnant <hhinnant@apple.com> | 2011-07-01 01:18:19 +0400 |
| commit | ce48a1137d56d368828d360e5f2a8162bac6517c (patch) | |
| tree | ec224d56b3d3a54fafbd14126993b38671f4ebec /libcxx/include/iterator | |
| parent | 070f96c567f7b0b3a0aa03178d2b6f05cdb2e447 (diff) | |
_STD -> _VSTD to avoid macro clash on windows
llvm-svn: 134190
Diffstat (limited to 'libcxx/include/iterator')
| -rw-r--r-- | libcxx/include/iterator | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libcxx/include/iterator b/libcxx/include/iterator index 6040eae215da..b232d09b3e49 100644 --- a/libcxx/include/iterator +++ b/libcxx/include/iterator @@ -488,7 +488,7 @@ next(_ForwardIter __x, typename iterator_traits<_ForwardIter>::difference_type __n = 1, typename enable_if<__is_forward_iterator<_ForwardIter>::value>::type* = 0) { - _STD::advance(__x, __n); + _VSTD::advance(__x, __n); return __x; } @@ -499,7 +499,7 @@ prev(_BidiretionalIter __x, typename iterator_traits<_BidiretionalIter>::difference_type __n = 1, typename enable_if<__is_bidirectional_iterator<_BidiretionalIter>::value>::type* = 0) { - _STD::advance(__x, -__n); + _VSTD::advance(__x, -__n); return __x; } @@ -628,7 +628,7 @@ public: {container->push_back(__value); return *this;} #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES _LIBCPP_INLINE_VISIBILITY back_insert_iterator& operator=(typename _Container::value_type&& __value) - {container->push_back(_STD::move(__value)); return *this;} + {container->push_back(_VSTD::move(__value)); return *this;} #endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES _LIBCPP_INLINE_VISIBILITY back_insert_iterator& operator*() {return *this;} _LIBCPP_INLINE_VISIBILITY back_insert_iterator& operator++() {return *this;} @@ -661,7 +661,7 @@ public: {container->push_front(__value); return *this;} #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES _LIBCPP_INLINE_VISIBILITY front_insert_iterator& operator=(typename _Container::value_type&& __value) - {container->push_front(_STD::move(__value)); return *this;} + {container->push_front(_VSTD::move(__value)); return *this;} #endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES _LIBCPP_INLINE_VISIBILITY front_insert_iterator& operator*() {return *this;} _LIBCPP_INLINE_VISIBILITY front_insert_iterator& operator++() {return *this;} @@ -696,7 +696,7 @@ public: {iter = container->insert(iter, __value); ++iter; return *this;} #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES _LIBCPP_INLINE_VISIBILITY insert_iterator& operator=(typename _Container::value_type&& __value) - {iter = container->insert(iter, _STD::move(__value)); ++iter; return *this;} + {iter = container->insert(iter, _VSTD::move(__value)); ++iter; return *this;} #endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES _LIBCPP_INLINE_VISIBILITY insert_iterator& operator*() {return *this;} _LIBCPP_INLINE_VISIBILITY insert_iterator& operator++() {return *this;} |