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/mutex | |
| parent | 070f96c567f7b0b3a0aa03178d2b6f05cdb2e447 (diff) | |
_STD -> _VSTD to avoid macro clash on windows
llvm-svn: 134190
Diffstat (limited to 'libcxx/include/mutex')
| -rw-r--r-- | libcxx/include/mutex | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libcxx/include/mutex b/libcxx/include/mutex index 69192a82f3d5..297baca5257e 100644 --- a/libcxx/include/mutex +++ b/libcxx/include/mutex @@ -467,7 +467,7 @@ class __call_once_param public: #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES _LIBCPP_INLINE_VISIBILITY - explicit __call_once_param(_F&& __f) : __f_(_STD::move(__f)) {} + explicit __call_once_param(_F&& __f) : __f_(_VSTD::move(__f)) {} #else _LIBCPP_INLINE_VISIBILITY explicit __call_once_param(const _F& __f) : __f_(__f) {} @@ -485,7 +485,7 @@ private: _LIBCPP_INLINE_VISIBILITY void __execute(__tuple_indices<_Indices...>) { - __invoke(_STD::move(_STD::get<0>(__f_)), _STD::move(_STD::get<_Indices>(__f_))...); + __invoke(_VSTD::move(_VSTD::get<0>(__f_)), _VSTD::move(_VSTD::get<_Indices>(__f_))...); } }; @@ -498,7 +498,7 @@ class __call_once_param public: #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES _LIBCPP_INLINE_VISIBILITY - explicit __call_once_param(_F&& __f) : __f_(_STD::move(__f)) {} + explicit __call_once_param(_F&& __f) : __f_(_VSTD::move(__f)) {} #else _LIBCPP_INLINE_VISIBILITY explicit __call_once_param(const _F& __f) : __f_(__f) {} @@ -533,8 +533,8 @@ call_once(once_flag& __flag, _Callable&& __func, _Args&&... __args) if (__builtin_expect(__flag.__state_ , ~0ul) != ~0ul) { typedef tuple<typename decay<_Callable>::type, typename decay<_Args>::type...> _G; - __call_once_param<_G> __p(_G(__decay_copy(_STD::forward<_Callable>(__func)), - __decay_copy(_STD::forward<_Args>(__args))...)); + __call_once_param<_G> __p(_G(__decay_copy(_VSTD::forward<_Callable>(__func)), + __decay_copy(_VSTD::forward<_Args>(__args))...)); __call_once(__flag.__state_, &__p, &__call_once_proxy<_G>); } } |