summaryrefslogtreecommitdiffstats
path: root/libcxx/test/thread/thread.condition
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/test/thread/thread.condition
parentddd1b7b801d8241dcc28c43792d0b73bac354632 (diff)
downloadbcm5719-llvm-3dc6455ff0216030b1864b1d9676549f74f1a128.tar.gz
bcm5719-llvm-3dc6455ff0216030b1864b1d9676549f74f1a128.zip
N3191: C++ Timeout Specification
llvm-svn: 119909
Diffstat (limited to 'libcxx/test/thread/thread.condition')
-rw-r--r--libcxx/test/thread/thread.condition/thread.condition.condvar/wait_until.pass.cpp4
-rw-r--r--libcxx/test/thread/thread.condition/thread.condition.condvar/wait_until_pred.pass.cpp4
-rw-r--r--libcxx/test/thread/thread.condition/thread.condition.condvarany/wait_until.pass.cpp4
-rw-r--r--libcxx/test/thread/thread.condition/thread.condition.condvarany/wait_until_pred.pass.cpp4
4 files changed, 8 insertions, 8 deletions
diff --git a/libcxx/test/thread/thread.condition/thread.condition.condvar/wait_until.pass.cpp b/libcxx/test/thread/thread.condition/thread.condition.condvar/wait_until.pass.cpp
index 12524c2e19e..2fa6345efb0 100644
--- a/libcxx/test/thread/thread.condition/thread.condition.condvar/wait_until.pass.cpp
+++ b/libcxx/test/thread/thread.condition/thread.condition.condvar/wait_until.pass.cpp
@@ -28,13 +28,13 @@ struct Clock
typedef duration::rep rep;
typedef duration::period period;
typedef std::chrono::time_point<Clock> time_point;
- static const bool is_monotonic = true;
+ static const bool is_steady = true;
static time_point now()
{
using namespace std::chrono;
return time_point(duration_cast<duration>(
- monotonic_clock::now().time_since_epoch()
+ steady_clock::now().time_since_epoch()
));
}
};
diff --git a/libcxx/test/thread/thread.condition/thread.condition.condvar/wait_until_pred.pass.cpp b/libcxx/test/thread/thread.condition/thread.condition.condvar/wait_until_pred.pass.cpp
index 070087c3786..c9efb8d9cd6 100644
--- a/libcxx/test/thread/thread.condition/thread.condition.condvar/wait_until_pred.pass.cpp
+++ b/libcxx/test/thread/thread.condition/thread.condition.condvar/wait_until_pred.pass.cpp
@@ -29,13 +29,13 @@ struct Clock
typedef duration::rep rep;
typedef duration::period period;
typedef std::chrono::time_point<Clock> time_point;
- static const bool is_monotonic = true;
+ static const bool is_steady = true;
static time_point now()
{
using namespace std::chrono;
return time_point(duration_cast<duration>(
- monotonic_clock::now().time_since_epoch()
+ steady_clock::now().time_since_epoch()
));
}
};
diff --git a/libcxx/test/thread/thread.condition/thread.condition.condvarany/wait_until.pass.cpp b/libcxx/test/thread/thread.condition/thread.condition.condvarany/wait_until.pass.cpp
index 051447966de..7b21660c162 100644
--- a/libcxx/test/thread/thread.condition/thread.condition.condvarany/wait_until.pass.cpp
+++ b/libcxx/test/thread/thread.condition/thread.condition.condvarany/wait_until.pass.cpp
@@ -27,13 +27,13 @@ struct Clock
typedef duration::rep rep;
typedef duration::period period;
typedef std::chrono::time_point<Clock> time_point;
- static const bool is_monotonic = true;
+ static const bool is_steady = true;
static time_point now()
{
using namespace std::chrono;
return time_point(duration_cast<duration>(
- monotonic_clock::now().time_since_epoch()
+ steady_clock::now().time_since_epoch()
));
}
};
diff --git a/libcxx/test/thread/thread.condition/thread.condition.condvarany/wait_until_pred.pass.cpp b/libcxx/test/thread/thread.condition/thread.condition.condvarany/wait_until_pred.pass.cpp
index 8b025a2ef0c..7c3493198d2 100644
--- a/libcxx/test/thread/thread.condition/thread.condition.condvarany/wait_until_pred.pass.cpp
+++ b/libcxx/test/thread/thread.condition/thread.condition.condvarany/wait_until_pred.pass.cpp
@@ -29,13 +29,13 @@ struct Clock
typedef duration::rep rep;
typedef duration::period period;
typedef std::chrono::time_point<Clock> time_point;
- static const bool is_monotonic = true;
+ static const bool is_steady = true;
static time_point now()
{
using namespace std::chrono;
return time_point(duration_cast<duration>(
- monotonic_clock::now().time_since_epoch()
+ steady_clock::now().time_since_epoch()
));
}
};
OpenPOWER on IntegriCloud