Filx build with SimGrid 3.14.

diff --git a/simgrid_features.h b/simgrid_features.h
index 3de11a0d27e42fc51cb5cdd2ce22b3db29e1aff7..82c7b236fc9e82fe0753546821f0be8fcd9ff393 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 < 31200UL // == SG < 3.12 == //
-#  error "Unsupported SimGrid version.  Need version >= 3.12"
+#if !defined(SIMGRID_VERSION) || SIMGRID_VERSION < 31400UL // == SG < 3.14 == //
+#  error "Unsupported SimGrid version.  Need version >= 3.14"

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

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

-#include <xbt/synchro_core.h>
+#include <xbt/ex.hpp>
+#include <xbt/synchro.h>

 
 class mutex_t {
 public:
 
 class mutex_t {
 public:


@@ -24,14 +25,12 @@ 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) {

-        xbt_ex_t e;
-        TRY {
+        try {

             xbt_cond_timedwait(cond, mutex.mutex, delay);
         }
             xbt_cond_timedwait(cond, mutex.mutex, delay);
         }

-        CATCH (e) {
+        catch (const xbt_ex& e) {

             if (e.category != timeout_error)
             if (e.category != timeout_error)

-                RETHROW;
-            xbt_ex_free(e);
+                throw;

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