xbt_cond_timedwait has changed and doesn't throw exception anymore.

diff --git a/simgrid_features.h b/simgrid_features.h
index 82c7b236fc9e82fe0753546821f0be8fcd9ff393..2cfb227a84e87764b7f234b50e4ee82b02248183 100644 (file)
--- a/simgrid_features.h
+++ b/simgrid_features.h
@@ -3,8 +3,8 @@
 
 #include <simgrid_config.h>
 
 
 #include <simgrid_config.h>
 

-#if !defined(SIMGRID_VERSION) || SIMGRID_VERSION < 31400UL // == SG < 3.14 == //
-#  error "Unsupported SimGrid version.  Need version >= 3.14"
+#if !defined(SIMGRID_VERSION) || SIMGRID_VERSION < 31800UL // == SG < 3.18 == //
+#  error "Unsupported SimGrid version.  Need version >= 3.18"

 #endif // =================================================================== //
 
 #endif // !SIMGRID_FEATURES_H
 #endif // =================================================================== //
 
 #endif // !SIMGRID_FEATURES_H

diff --git a/synchro.h b/synchro.h
index 07897e04febe1eea9075db9590c4bf9571dff2dd..bd49783ccdc943f2710ed76f9e4e60787fb0b5cf 100644 (file)
--- a/synchro.h
+++ b/synchro.h
@@ -1,7 +1,6 @@
 #ifndef SYNCHRO_H
 #define SYNCHRO_H
 
 #ifndef SYNCHRO_H
 #define SYNCHRO_H
 

-#include <xbt/ex.hpp>

 #include <xbt/synchro.h>
 
 class mutex_t {
 #include <xbt/synchro.h>
 
 class mutex_t {


@@ -25,12 +24,7 @@ public:
     void signal()               { xbt_cond_signal(cond);            }
     void wait(mutex_t& mutex)   { xbt_cond_wait(cond, mutex.mutex); }
     bool timedwait(mutex_t& mutex, double delay) {
     void signal()               { xbt_cond_signal(cond);            }
     void wait(mutex_t& mutex)   { xbt_cond_wait(cond, mutex.mutex); }
     bool timedwait(mutex_t& mutex, double delay) {

-        try {
-            xbt_cond_timedwait(cond, mutex.mutex, delay);
-        }
-        catch (const xbt_ex& e) {
-            if (e.category != timeout_error)
-                throw;
+        if (xbt_cond_timedwait(cond, mutex.mutex, delay)) {

             mutex.acquire();
             return false;       // got a timeout
         }
             mutex.acquire();
             return false;       // got a timeout
         }