_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/queue b/include/queue
index 896c682..bed5bb7 100644
--- a/include/queue
+++ b/include/queue
@@ -211,7 +211,7 @@
_LIBCPP_INLINE_VISIBILITY
queue(queue&& __q)
_NOEXCEPT_(is_nothrow_move_constructible<container_type>::value)
- : c(_STD::move(__q.c)) {}
+ : c(_VSTD::move(__q.c)) {}
#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
_LIBCPP_INLINE_VISIBILITY
@@ -221,14 +221,14 @@
_LIBCPP_INLINE_VISIBILITY
queue& operator=(queue&& __q)
_NOEXCEPT_(is_nothrow_move_assignable<container_type>::value)
- {c = _STD::move(__q.c); return *this;}
+ {c = _VSTD::move(__q.c); return *this;}
#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
_LIBCPP_INLINE_VISIBILITY
explicit queue(const container_type& __c) : c(__c) {}
#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
_LIBCPP_INLINE_VISIBILITY
- explicit queue(container_type&& __c) : c(_STD::move(__c)) {}
+ explicit queue(container_type&& __c) : c(_VSTD::move(__c)) {}
#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
template <class _Alloc>
_LIBCPP_INLINE_VISIBILITY
@@ -254,13 +254,13 @@
queue(container_type&& __c, const _Alloc& __a,
typename enable_if<uses_allocator<container_type,
_Alloc>::value>::type* = 0)
- : c(_STD::move(__c), __a) {}
+ : c(_VSTD::move(__c), __a) {}
template <class _Alloc>
_LIBCPP_INLINE_VISIBILITY
queue(queue&& __q, const _Alloc& __a,
typename enable_if<uses_allocator<container_type,
_Alloc>::value>::type* = 0)
- : c(_STD::move(__q.c), __a) {}
+ : c(_VSTD::move(__q.c), __a) {}
#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
@@ -282,12 +282,12 @@
void push(const value_type& __v) {c.push_back(__v);}
#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
_LIBCPP_INLINE_VISIBILITY
- void push(value_type&& __v) {c.push_back(_STD::move(__v));}
+ void push(value_type&& __v) {c.push_back(_VSTD::move(__v));}
#ifndef _LIBCPP_HAS_NO_VARIADICS
template <class... _Args>
_LIBCPP_INLINE_VISIBILITY
void emplace(_Args&&... __args)
- {c.emplace_back(_STD::forward<_Args>(__args)...);}
+ {c.emplace_back(_VSTD::forward<_Args>(__args)...);}
#endif // _LIBCPP_HAS_NO_VARIADICS
#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
_LIBCPP_INLINE_VISIBILITY
@@ -297,7 +297,7 @@
void swap(queue& __q)
_NOEXCEPT_(__is_nothrow_swappable<container_type>::value)
{
- using _STD::swap;
+ using _VSTD::swap;
swap(c, __q.c);
}
@@ -408,7 +408,7 @@
priority_queue(priority_queue&& __q)
_NOEXCEPT_(is_nothrow_move_constructible<container_type>::value &&
is_nothrow_move_constructible<value_compare>::value)
- : c(_STD::move(__q.c)), comp(_STD::move(__q.comp)) {}
+ : c(_VSTD::move(__q.c)), comp(_VSTD::move(__q.comp)) {}
#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
_LIBCPP_INLINE_VISIBILITY
@@ -420,7 +420,7 @@
priority_queue& operator=(priority_queue&& __q)
_NOEXCEPT_(is_nothrow_move_assignable<container_type>::value &&
is_nothrow_move_assignable<value_compare>::value)
- {c = _STD::move(__q.c); comp = _STD::move(__q.comp); return *this;}
+ {c = _VSTD::move(__q.c); comp = _VSTD::move(__q.comp); return *this;}
#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
_LIBCPP_INLINE_VISIBILITY
@@ -498,7 +498,7 @@
: c(__c),
comp(__comp)
{
- _STD::make_heap(c.begin(), c.end(), comp);
+ _VSTD::make_heap(c.begin(), c.end(), comp);
}
#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
@@ -507,10 +507,10 @@
inline _LIBCPP_INLINE_VISIBILITY
priority_queue<_Tp, _Container, _Compare>::priority_queue(const value_compare& __comp,
container_type&& __c)
- : c(_STD::move(__c)),
+ : c(_VSTD::move(__c)),
comp(__comp)
{
- _STD::make_heap(c.begin(), c.end(), comp);
+ _VSTD::make_heap(c.begin(), c.end(), comp);
}
#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
@@ -523,7 +523,7 @@
: c(__f, __l),
comp(__comp)
{
- _STD::make_heap(c.begin(), c.end(), comp);
+ _VSTD::make_heap(c.begin(), c.end(), comp);
}
template <class _Tp, class _Container, class _Compare>
@@ -536,7 +536,7 @@
comp(__comp)
{
c.insert(c.end(), __f, __l);
- _STD::make_heap(c.begin(), c.end(), comp);
+ _VSTD::make_heap(c.begin(), c.end(), comp);
}
#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
@@ -547,11 +547,11 @@
priority_queue<_Tp, _Container, _Compare>::priority_queue(_InputIter __f, _InputIter __l,
const value_compare& __comp,
container_type&& __c)
- : c(_STD::move(__c)),
+ : c(_VSTD::move(__c)),
comp(__comp)
{
c.insert(c.end(), __f, __l);
- _STD::make_heap(c.begin(), c.end(), comp);
+ _VSTD::make_heap(c.begin(), c.end(), comp);
}
#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
@@ -589,7 +589,7 @@
: c(__c, __a),
comp(__comp)
{
- _STD::make_heap(c.begin(), c.end(), comp);
+ _VSTD::make_heap(c.begin(), c.end(), comp);
}
template <class _Tp, class _Container, class _Compare>
@@ -602,7 +602,7 @@
: c(__q.c, __a),
comp(__q.comp)
{
- _STD::make_heap(c.begin(), c.end(), comp);
+ _VSTD::make_heap(c.begin(), c.end(), comp);
}
#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
@@ -615,10 +615,10 @@
const _Alloc& __a,
typename enable_if<uses_allocator<container_type,
_Alloc>::value>::type*)
- : c(_STD::move(__c), __a),
+ : c(_VSTD::move(__c), __a),
comp(__comp)
{
- _STD::make_heap(c.begin(), c.end(), comp);
+ _VSTD::make_heap(c.begin(), c.end(), comp);
}
template <class _Tp, class _Container, class _Compare>
@@ -628,10 +628,10 @@
const _Alloc& __a,
typename enable_if<uses_allocator<container_type,
_Alloc>::value>::type*)
- : c(_STD::move(__q.c), __a),
- comp(_STD::move(__q.comp))
+ : c(_VSTD::move(__q.c), __a),
+ comp(_VSTD::move(__q.comp))
{
- _STD::make_heap(c.begin(), c.end(), comp);
+ _VSTD::make_heap(c.begin(), c.end(), comp);
}
#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
@@ -642,7 +642,7 @@
priority_queue<_Tp, _Container, _Compare>::push(const value_type& __v)
{
c.push_back(__v);
- _STD::push_heap(c.begin(), c.end(), comp);
+ _VSTD::push_heap(c.begin(), c.end(), comp);
}
#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
@@ -652,8 +652,8 @@
void
priority_queue<_Tp, _Container, _Compare>::push(value_type&& __v)
{
- c.push_back(_STD::move(__v));
- _STD::push_heap(c.begin(), c.end(), comp);
+ c.push_back(_VSTD::move(__v));
+ _VSTD::push_heap(c.begin(), c.end(), comp);
}
#ifndef _LIBCPP_HAS_NO_VARIADICS
@@ -664,8 +664,8 @@
void
priority_queue<_Tp, _Container, _Compare>::emplace(_Args&&... __args)
{
- c.emplace_back(_STD::forward<_Args>(__args)...);
- _STD::push_heap(c.begin(), c.end(), comp);
+ c.emplace_back(_VSTD::forward<_Args>(__args)...);
+ _VSTD::push_heap(c.begin(), c.end(), comp);
}
#endif // _LIBCPP_HAS_NO_VARIADICS
@@ -676,7 +676,7 @@
void
priority_queue<_Tp, _Container, _Compare>::pop()
{
- _STD::pop_heap(c.begin(), c.end(), comp);
+ _VSTD::pop_heap(c.begin(), c.end(), comp);
c.pop_back();
}
@@ -687,7 +687,7 @@
_NOEXCEPT_(__is_nothrow_swappable<container_type>::value &&
__is_nothrow_swappable<value_compare>::value)
{
- using _STD::swap;
+ using _VSTD::swap;
swap(c, __q.c);
swap(comp, __q.comp);
}
