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 | 0949eedbd621bc1611266fb180d9a356ee1eaf9f (patch) | |
| tree | 32980a76874f97a8dfca6329b5b3eb9213a3be60 /include/thread | |
| parent | d318d49e5c74179d0f4f9a79ab0f54a9531c5513 (diff) | |
| download | libcxx-0949eedbd621bc1611266fb180d9a356ee1eaf9f.tar.gz | |
_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
Diffstat (limited to 'include/thread')
| -rw-r--r-- | include/thread | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/thread b/include/thread index a04572f6b..ce3ca49ef 100644 --- a/include/thread +++ b/include/thread @@ -284,7 +284,7 @@ public: #endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES _LIBCPP_INLINE_VISIBILITY - void swap(thread& __t) {_STD::swap(__t_, __t.__t_);} + void swap(thread& __t) {_VSTD::swap(__t_, __t.__t_);} _LIBCPP_INLINE_VISIBILITY bool joinable() const {return __t_ != 0;} @@ -325,7 +325,7 @@ inline _LIBCPP_INLINE_VISIBILITY void __threaad_execute(tuple<_F, _Args...>& __t, __tuple_indices<_Indices...>) { - __invoke(_STD::move(_STD::get<0>(__t)), _STD::move(_STD::get<_Indices>(__t))...); + __invoke(_VSTD::move(_VSTD::get<0>(__t)), _VSTD::move(_VSTD::get<_Indices>(__t))...); } template <class _F> @@ -345,8 +345,8 @@ template <class _F, class ..._Args, thread::thread(_F&& __f, _Args&&... __args) { typedef tuple<typename decay<_F>::type, typename decay<_Args>::type...> _G; - _STD::unique_ptr<_G> __p(new _G(__decay_copy(_STD::forward<_F>(__f)), - __decay_copy(_STD::forward<_Args>(__args))...)); + _VSTD::unique_ptr<_G> __p(new _G(__decay_copy(_VSTD::forward<_F>(__f)), + __decay_copy(_VSTD::forward<_Args>(__args))...)); int __ec = pthread_create(&__t_, 0, &__thread_proxy<_G>, __p.get()); if (__ec == 0) __p.release(); |