X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7b20a596a629242418d813ae845fcd64d36fc150..e167326c1369032305b7eb87e166b12d6690df64:/src/s4u/s4u_conditionVariable.cpp

diff --git a/src/s4u/s4u_conditionVariable.cpp b/src/s4u/s4u_conditionVariable.cpp
index 02f4f825db..52b5b9089a 100644
--- a/src/s4u/s4u_conditionVariable.cpp
+++ b/src/s4u/s4u_conditionVariable.cpp
@@ -6,27 +6,28 @@
 #include "simgrid/s4u/conditionVariable.hpp"
 #include "simgrid/simix.h"
 
-using namespace simgrid;
+namespace simgrid {
+namespace s4u {
 
-s4u::ConditionVariable::ConditionVariable()  : cond_(simcall_cond_init()){
+ConditionVariable::ConditionVariable()  : cond_(simcall_cond_init()){
     
 }
 
-s4u::ConditionVariable::~ConditionVariable() {
+ConditionVariable::~ConditionVariable() {
   SIMIX_cond_unref(cond_);
 }
 
 /**
  * Wait functions
  */
-void s4u::ConditionVariable::wait(std::unique_lock<Mutex>& lock) {
+void ConditionVariable::wait(std::unique_lock<Mutex>& lock) {
   simcall_cond_wait(cond_, lock.mutex()->mutex_);
 }
 
 std::cv_status s4u::ConditionVariable::wait_for(std::unique_lock<Mutex>& lock, double timeout) {
   try {
     simcall_cond_wait_timeout(cond_, lock.mutex()->mutex_, timeout);
-    return std::cv_status::timeout;
+    return std::cv_status::no_timeout;
   }
   catch (xbt_ex& e) {
 
@@ -49,7 +50,7 @@ std::cv_status s4u::ConditionVariable::wait_for(std::unique_lock<Mutex>& lock, d
   }
 }
 
-std::cv_status s4u::ConditionVariable::wait_until(std::unique_lock<Mutex>& lock, double timeout_time)
+std::cv_status ConditionVariable::wait_until(std::unique_lock<Mutex>& lock, double timeout_time)
 {
   double now = SIMIX_get_clock();
   double timeout;
@@ -63,12 +64,13 @@ std::cv_status s4u::ConditionVariable::wait_until(std::unique_lock<Mutex>& lock,
 /**
  * Notify functions
  */
-void s4u::ConditionVariable::notify_one() {
+void ConditionVariable::notify_one() {
    simcall_cond_signal(cond_);
 }
  
-void s4u::ConditionVariable::notify_all() {
+void ConditionVariable::notify_all() {
   simcall_cond_broadcast(cond_);
 }
 
- 
+}
+}