Merge s4u wait_any

[simgrid.git] / src / simix / Synchro.h

diff --git a/src/simix/Synchro.h b/src/simix/Synchro.h
index da0e8e0..6421d5c 100644 (file)
--- a/src/simix/Synchro.h
+++ b/src/simix/Synchro.h
@@ -7,6 +7,7 @@
 #define _SIMIX_SYNCHRO_HPP
 
 #include <string>
+#include <list>
 
 #include <xbt/base.h>
 #include "simgrid/forward.h"
@@ -24,8 +25,7 @@ namespace simix {
     virtual ~Synchro();
     e_smx_state_t state = SIMIX_WAITING; /* State of the synchro */
     std::string name;                  /* synchro name if any */
-    xbt_fifo_t simcalls = nullptr;     /* List of simcalls waiting for this synchro */
-    char *category = nullptr;          /* For instrumentation */
+    std::list<smx_simcall_t> simcalls; /* List of simcalls waiting for this synchro */
 
     virtual void suspend()=0;
     virtual void resume()=0;