summaryrefslogtreecommitdiffstats
path: root/libcxx/include/future
diff options
context:
space:
mode:
authorHoward Hinnant <hhinnant@apple.com>2010-11-20 19:16:30 +0000
committerHoward Hinnant <hhinnant@apple.com>2010-11-20 19:16:30 +0000
commit3dc6455ff0216030b1864b1d9676549f74f1a128 (patch)
tree1c4a1fc9a4e36b4a3081b71563f3184d4de66542 /libcxx/include/future
parentddd1b7b801d8241dcc28c43792d0b73bac354632 (diff)
downloadbcm5719-llvm-3dc6455ff0216030b1864b1d9676549f74f1a128.tar.gz
bcm5719-llvm-3dc6455ff0216030b1864b1d9676549f74f1a128.zip
N3191: C++ Timeout Specification
llvm-svn: 119909
Diffstat (limited to 'libcxx/include/future')
-rw-r--r--libcxx/include/future2
1 files changed, 1 insertions, 1 deletions
diff --git a/libcxx/include/future b/libcxx/include/future
index 55b0ead8f10..be975f48841 100644
--- a/libcxx/include/future
+++ b/libcxx/include/future
@@ -603,7 +603,7 @@ inline _LIBCPP_INLINE_VISIBILITY
future_status
__assoc_sub_state::wait_for(const chrono::duration<_Rep, _Period>& __rel_time) const
{
- return wait_until(chrono::monotonic_clock::now() + __rel_time);
+ return wait_until(chrono::steady_clock::now() + __rel_time);
}
template <class _R>
OpenPOWER on IntegriCloud