projects
/
platform
/
upstream
/
boost.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 1.57.0
[platform/upstream/boost.git]
/
libs
/
thread
/
test
/
util.inl
diff --git
a/libs/thread/test/util.inl
b/libs/thread/test/util.inl
index
b85fbb0
..
010dc50
100644
(file)
--- a/
libs/thread/test/util.inl
+++ b/
libs/thread/test/util.inl
@@
-74,7
+74,7
@@
public:
void start()
{
if (type != use_sleep_only) {
void start()
{
if (type != use_sleep_only) {
- boost::
mutex::scoped_lock
lock(mutex); done = false;
+ boost::
unique_lock<boost::mutex>
lock(mutex); done = false;
} else {
done = false;
}
} else {
done = false;
}
@@
-82,7
+82,7
@@
public:
void finish()
{
if (type != use_sleep_only) {
void finish()
{
if (type != use_sleep_only) {
- boost::
mutex::scoped_lock
lock(mutex);
+ boost::
unique_lock<boost::mutex>
lock(mutex);
done = true;
if (type == use_condition)
cond.notify_one();
done = true;
if (type == use_condition)
cond.notify_one();
@@
-96,7
+96,7
@@
public:
if (type != use_condition)
boost::thread::sleep(xt);
if (type != use_sleep_only) {
if (type != use_condition)
boost::thread::sleep(xt);
if (type != use_sleep_only) {
- boost::
mutex::scoped_lock
lock(mutex);
+ boost::
unique_lock<boost::mutex>
lock(mutex);
while (type == use_condition && !done) {
if (!cond.timed_wait(lock, xt))
break;
while (type == use_condition && !done) {
if (!cond.timed_wait(lock, xt))
break;