Imported Upstream version 1.57.0

[platform/upstream/boost.git] / libs / thread / test / condition_test_common.hpp

diff --git a/libs/thread/test/condition_test_common.hpp b/libs/thread/test/condition_test_common.hpp
index 38f7790..4aa114e 100644 (file)
--- a/libs/thread/test/condition_test_common.hpp
+++ b/libs/thread/test/condition_test_common.hpp
@@ -2,7 +2,7 @@
 #define CONDITION_TEST_COMMON_HPP
 // Copyright (C) 2007 Anthony Williams
 //
-//  Distributed under the Boost Software License, Version 1.0. (See accompanying 
+//  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/thread/condition_variable.hpp>
@@ -10,14 +10,14 @@
 #include <boost/thread/thread_time.hpp>
 
 unsigned const timeout_seconds=5;
-    
+
 struct wait_for_flag
 {
     boost::mutex mutex;
     boost::condition_variable cond_var;
     bool flag;
     unsigned woken;
-        
+
     wait_for_flag():
         flag(false),woken(0)
     {}
@@ -25,11 +25,11 @@ struct wait_for_flag
     struct check_flag
     {
         bool const& flag;
-            
+
         check_flag(bool const& flag_):
             flag(flag_)
         {}
-            
+
         bool operator()() const
         {
             return flag;
@@ -38,10 +38,10 @@ struct wait_for_flag
         void operator=(check_flag&);
     };
 
-        
+
     void wait_without_predicate()
     {
-        boost::mutex::scoped_lock lock(mutex);
+        boost::unique_lock<boost::mutex> lock(mutex);
         while(!flag)
         {
             cond_var.wait(lock);
@@ -51,7 +51,7 @@ struct wait_for_flag
 
     void wait_with_predicate()
     {
-        boost::mutex::scoped_lock lock(mutex);
+        boost::unique_lock<boost::mutex> lock(mutex);
         cond_var.wait(lock,check_flag(flag));
         if(flag)
         {
@@ -62,8 +62,8 @@ struct wait_for_flag
     void timed_wait_without_predicate()
     {
         boost::system_time const timeout=boost::get_system_time()+boost::posix_time::seconds(timeout_seconds);
-            
-        boost::mutex::scoped_lock lock(mutex);
+
+        boost::unique_lock<boost::mutex> lock(mutex);
         while(!flag)
         {
             if(!cond_var.timed_wait(lock,timeout))
@@ -77,7 +77,7 @@ struct wait_for_flag
     void timed_wait_with_predicate()
     {
         boost::system_time const timeout=boost::get_system_time()+boost::posix_time::seconds(timeout_seconds);
-        boost::mutex::scoped_lock lock(mutex);
+        boost::unique_lock<boost::mutex> lock(mutex);
         if(cond_var.timed_wait(lock,timeout,check_flag(flag)) && flag)
         {
             ++woken;
@@ -85,7 +85,7 @@ struct wait_for_flag
     }
     void relative_timed_wait_with_predicate()
     {
-        boost::mutex::scoped_lock lock(mutex);
+        boost::unique_lock<boost::mutex> lock(mutex);
         if(cond_var.timed_wait(lock,boost::posix_time::seconds(timeout_seconds),check_flag(flag)) && flag)
         {
             ++woken;