summaryrefslogtreecommitdiffstats
path: root/libcxx/include/mutex
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/mutex
parentddd1b7b801d8241dcc28c43792d0b73bac354632 (diff)
downloadbcm5719-llvm-3dc6455ff0216030b1864b1d9676549f74f1a128.tar.gz
bcm5719-llvm-3dc6455ff0216030b1864b1d9676549f74f1a128.zip
N3191: C++ Timeout Specification
llvm-svn: 119909
Diffstat (limited to 'libcxx/include/mutex')
-rw-r--r--libcxx/include/mutex4
1 files changed, 2 insertions, 2 deletions
diff --git a/libcxx/include/mutex b/libcxx/include/mutex
index 45ce66969d0..c87d0fdaecb 100644
--- a/libcxx/include/mutex
+++ b/libcxx/include/mutex
@@ -221,7 +221,7 @@ public:
template <class _Rep, class _Period>
_LIBCPP_INLINE_VISIBILITY
bool try_lock_for(const chrono::duration<_Rep, _Period>& __d)
- {return try_lock_until(chrono::monotonic_clock::now() + __d);}
+ {return try_lock_until(chrono::steady_clock::now() + __d);}
template <class _Clock, class _Duration>
bool try_lock_until(const chrono::time_point<_Clock, _Duration>& __t);
void unlock();
@@ -264,7 +264,7 @@ public:
template <class _Rep, class _Period>
_LIBCPP_INLINE_VISIBILITY
bool try_lock_for(const chrono::duration<_Rep, _Period>& __d)
- {return try_lock_until(chrono::monotonic_clock::now() + __d);}
+ {return try_lock_until(chrono::steady_clock::now() + __d);}
template <class _Clock, class _Duration>
bool try_lock_until(const chrono::time_point<_Clock, _Duration>& __t);
void unlock();
OpenPOWER on IntegriCloud