projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 8.36.169.0
[platform/framework/web/crosswalk.git]
/
src
/
third_party
/
libc++
/
trunk
/
test
/
thread
/
thread.mutex
/
thread.lock
/
thread.lock.shared
/
thread.lock.shared.locking
/
lock.pass.cpp
diff --git
a/src/third_party/libc++/trunk/test/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp
b/src/third_party/libc++/trunk/test/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp
index
c6617a5
..
ecac479
100644
(file)
--- a/
src/third_party/libc++/trunk/test/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp
+++ b/
src/third_party/libc++/trunk/test/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp
@@
-21,7
+21,7
@@
#if _LIBCPP_STD_VER > 11
#if _LIBCPP_STD_VER > 11
-std::shared_mutex m;
+std::shared_
timed_
mutex m;
typedef std::chrono::system_clock Clock;
typedef Clock::time_point time_point;
typedef std::chrono::system_clock Clock;
typedef Clock::time_point time_point;
@@
-31,7
+31,7
@@
typedef std::chrono::nanoseconds ns;
void f()
{
void f()
{
- std::shared_lock<std::shared_mutex> lk(m, std::defer_lock);
+ std::shared_lock<std::shared_
timed_
mutex> lk(m, std::defer_lock);
time_point t0 = Clock::now();
lk.lock();
time_point t1 = Clock::now();
time_point t0 = Clock::now();
lk.lock();
time_point t1 = Clock::now();