_STD -> _VSTD to avoid macro clash on windows

llvm-svn: 134190

1 files changed, 14 insertions, 14 deletions

diff --git a/libcxx/include/scoped_allocator b/libcxx/include/scoped_allocator
index e8822955dd2..9427a376d88 100644
--- a/libcxx/include/scoped_allocator
+++ b/libcxx/include/scoped_allocator
@@ -194,7 +194,7 @@ protected:
         _LIBCPP_INLINE_VISIBILITY
         __scoped_allocator_storage(_OuterA2&& __outerAlloc,
                                    const _InnerAllocs& ...__innerAllocs) _NOEXCEPT
-            : outer_allocator_type(_STD::forward<_OuterA2>(__outerAlloc)),
+            : outer_allocator_type(_VSTD::forward<_OuterA2>(__outerAlloc)),
               __inner_(__innerAllocs...) {}
 
     template <class _OuterA2,
@@ -214,8 +214,8 @@ protected:
         _LIBCPP_INLINE_VISIBILITY
         __scoped_allocator_storage(
             __scoped_allocator_storage<_OuterA2, _InnerAllocs...>&& __other) _NOEXCEPT
-            : outer_allocator_type(_STD::move(__other.outer_allocator())),
-              __inner_(_STD::move(__other.inner_allocator())) {}
+            : outer_allocator_type(_VSTD::move(__other.outer_allocator())),
+              __inner_(_VSTD::move(__other.inner_allocator())) {}
 
     template <class _OuterA2,
               class = typename enable_if<
@@ -224,7 +224,7 @@ protected:
         _LIBCPP_INLINE_VISIBILITY
         __scoped_allocator_storage(_OuterA2&& __o,
                                    const inner_allocator_type& __i) _NOEXCEPT
-            : outer_allocator_type(_STD::forward<_OuterA2>(__o)),
+            : outer_allocator_type(_VSTD::forward<_OuterA2>(__o)),
               __inner_(__i)
         {
         }
@@ -274,7 +274,7 @@ protected:
                       >::type>
         _LIBCPP_INLINE_VISIBILITY
         __scoped_allocator_storage(_OuterA2&& __outerAlloc) _NOEXCEPT
-            : outer_allocator_type(_STD::forward<_OuterA2>(__outerAlloc)) {}
+            : outer_allocator_type(_VSTD::forward<_OuterA2>(__outerAlloc)) {}
 
     template <class _OuterA2,
               class = typename enable_if<
@@ -292,7 +292,7 @@ protected:
         _LIBCPP_INLINE_VISIBILITY
         __scoped_allocator_storage(
             __scoped_allocator_storage<_OuterA2>&& __other) _NOEXCEPT
-            : outer_allocator_type(_STD::move(__other.outer_allocator())) {}
+            : outer_allocator_type(_VSTD::move(__other.outer_allocator())) {}
 
     _LIBCPP_INLINE_VISIBILITY
     inner_allocator_type& inner_allocator() _NOEXCEPT
@@ -354,7 +354,7 @@ struct __outermost<_Alloc, true>
 {
     typedef typename remove_reference
                      <
-                        decltype(_STD::declval<_Alloc>().outer_allocator())
+                        decltype(_VSTD::declval<_Alloc>().outer_allocator())
                      >::type                                    _OuterAlloc;
     typedef typename __outermost<_OuterAlloc>::type             type;
     _LIBCPP_INLINE_VISIBILITY
@@ -414,7 +414,7 @@ public:
         _LIBCPP_INLINE_VISIBILITY
         scoped_allocator_adaptor(_OuterA2&& __outerAlloc,
                                  const _InnerAllocs& ...__innerAllocs) _NOEXCEPT
-            : base(_STD::forward<_OuterA2>(__outerAlloc), __innerAllocs...) {}
+            : base(_VSTD::forward<_OuterA2>(__outerAlloc), __innerAllocs...) {}
     // scoped_allocator_adaptor(const scoped_allocator_adaptor& __other) = default;
     template <class _OuterA2,
               class = typename enable_if<
@@ -431,7 +431,7 @@ public:
         _LIBCPP_INLINE_VISIBILITY
         scoped_allocator_adaptor(
             scoped_allocator_adaptor<_OuterA2, _InnerAllocs...>&& __other) _NOEXCEPT
-                : base(_STD::move(__other)) {}
+                : base(_VSTD::move(__other)) {}
 
     // ~scoped_allocator_adaptor() = default;
 
@@ -471,7 +471,7 @@ public:
         _LIBCPP_INLINE_VISIBILITY
         void construct(_Tp* __p, _Args&& ...__args)
             {__construct(__uses_alloc_ctor<_Tp, inner_allocator_type, _Args...>(),
-                         __p, _STD::forward<_Args>(__args)...);}
+                         __p, _VSTD::forward<_Args>(__args)...);}
     template <class _Tp>
         _LIBCPP_INLINE_VISIBILITY
         void destroy(_Tp* __p)
@@ -494,7 +494,7 @@ private:
     _LIBCPP_INLINE_VISIBILITY
     scoped_allocator_adaptor(_OuterA2&& __o,
                              const inner_allocator_type& __i) _NOEXCEPT
-        : base(_STD::forward<_OuterA2>(__o), __i) {}
+        : base(_VSTD::forward<_OuterA2>(__o), __i) {}
 
     template <class _Tp, class... _Args>
         _LIBCPP_INLINE_VISIBILITY
@@ -505,7 +505,7 @@ private:
                 (
                     _OM()(outer_allocator()),
                     __p,
-                    _STD::forward<_Args>(__args)...
+                    _VSTD::forward<_Args>(__args)...
                 );
             }
 
@@ -520,7 +520,7 @@ private:
                     __p,
                     allocator_arg,
                     inner_allocator(),
-                    _STD::forward<_Args>(__args)...
+                    _VSTD::forward<_Args>(__args)...
                 );
             }
 
@@ -533,7 +533,7 @@ private:
                 (
                     _OM()(outer_allocator()),
                     __p,
-                    _STD::forward<_Args>(__args)...,
+                    _VSTD::forward<_Args>(__args)...,
                     inner_allocator()
                 );
             }