summaryrefslogtreecommitdiffstats
path: root/libcxx/include/condition_variable
diff options
context:
space:
mode:
authorHoward Hinnant <hhinnant@apple.com>2011-06-30 21:18:19 +0000
committerHoward Hinnant <hhinnant@apple.com>2011-06-30 21:18:19 +0000
commitce48a1137d56d368828d360e5f2a8162bac6517c (patch)
treeec224d56b3d3a54fafbd14126993b38671f4ebec /libcxx/include/condition_variable
parent070f96c567f7b0b3a0aa03178d2b6f05cdb2e447 (diff)
downloadbcm5719-llvm-ce48a1137d56d368828d360e5f2a8162bac6517c.tar.gz
bcm5719-llvm-ce48a1137d56d368828d360e5f2a8162bac6517c.zip
_STD -> _VSTD to avoid macro clash on windows
llvm-svn: 134190
Diffstat (limited to 'libcxx/include/condition_variable')
-rw-r--r--libcxx/include/condition_variable2
1 files changed, 1 insertions, 1 deletions
diff --git a/libcxx/include/condition_variable b/libcxx/include/condition_variable
index 124d3880bd1..fc3ac3dff5c 100644
--- a/libcxx/include/condition_variable
+++ b/libcxx/include/condition_variable
@@ -243,7 +243,7 @@ condition_variable_any::wait_for(_Lock& __lock,
_Predicate __pred)
{
return wait_until(__lock, chrono::steady_clock::now() + __d,
- _STD::move(__pred));
+ _VSTD::move(__pred));
}
_LIBCPP_VISIBLE
OpenPOWER on IntegriCloud