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 | ce48a1137d56d368828d360e5f2a8162bac6517c (patch) | |
| tree | ec224d56b3d3a54fafbd14126993b38671f4ebec /libcxx/include/__mutex_base | |
| parent | 070f96c567f7b0b3a0aa03178d2b6f05cdb2e447 (diff) | |
| download | bcm5719-llvm-ce48a1137d56d368828d360e5f2a8162bac6517c.tar.gz bcm5719-llvm-ce48a1137d56d368828d360e5f2a8162bac6517c.zip | |
_STD -> _VSTD to avoid macro clash on windows
llvm-svn: 134190
Diffstat (limited to 'libcxx/include/__mutex_base')
| -rw-r--r-- | libcxx/include/__mutex_base | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libcxx/include/__mutex_base b/libcxx/include/__mutex_base index 6f98d2e6408..9e472fcc267 100644 --- a/libcxx/include/__mutex_base +++ b/libcxx/include/__mutex_base @@ -190,8 +190,8 @@ public: _LIBCPP_INLINE_VISIBILITY void swap(unique_lock& __u) { - _STD::swap(__m_, __u.__m_); - _STD::swap(__owns_, __u.__owns_); + _VSTD::swap(__m_, __u.__m_); + _VSTD::swap(__owns_, __u.__owns_); } _LIBCPP_INLINE_VISIBILITY mutex_type* release() @@ -429,7 +429,7 @@ condition_variable::wait_for(unique_lock<mutex>& __lk, _Predicate __pred) { return wait_until(__lk, chrono::steady_clock::now() + __d, - _STD::move(__pred)); + _VSTD::move(__pred)); } _LIBCPP_END_NAMESPACE_STD |
