diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2017-01-14 15:39:13 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2017-01-14 15:39:13 +0000 |
| commit | fd857c8184809f0fac54f7ec9d9e91477beb1b7d (patch) | |
| tree | 58ed2d52992ba3dcfcc9e34d35ab3ed8b7aa76ed /include/__mutex_base | |
| parent | 78da6db1f23c0bfe8a36a5b5c05d06005037e556 (diff) | |
Vendor import of libc++ release_40 branch r292009:vendor/libc++/libc++-release_40-r292009
Notes
svn path=/vendor/libc++/dist/; revision=312179
svn path=/vendor/libc++/libc++-release_40-r292009/; revision=312180; tag=vendor/libc++/libc++-release_40-r292009
Diffstat (limited to 'include/__mutex_base')
| -rw-r--r-- | include/__mutex_base | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/__mutex_base b/include/__mutex_base index cce928784a46..21638ee3292d 100644 --- a/include/__mutex_base +++ b/include/__mutex_base @@ -410,8 +410,8 @@ condition_variable::wait_for(unique_lock<mutex>& __lk, typedef time_point<system_clock, duration<long double, nano> > __sys_tpf; typedef time_point<system_clock, nanoseconds> __sys_tpi; __sys_tpf _Max = __sys_tpi::max(); - system_clock::time_point __s_now = system_clock::now(); steady_clock::time_point __c_now = steady_clock::now(); + system_clock::time_point __s_now = system_clock::now(); if (_Max - __d > __s_now) __do_timed_wait(__lk, __s_now + __ceil<nanoseconds>(__d)); else |