Factorize smpi*_f2c, smpi_*c2f and other f77 calls

[simgrid.git] / src / simix / popping.cpp

diff --git a/src/simix/popping.cpp b/src/simix/popping.cpp
index 1e59de2..ccbc8d8 100644 (file)
--- a/src/simix/popping.cpp
+++ b/src/simix/popping.cpp
@@ -11,11 +11,11 @@
 #include "src/mc/mc_private.h"
 #endif
 
-#include "src/synchro/SynchroExec.hpp"
-#include "src/synchro/SynchroComm.hpp"
-#include "src/synchro/SynchroSleep.hpp"
-#include "src/synchro/SynchroRaw.hpp"
-#include "src/synchro/SynchroIo.hpp"
+#include "src/kernel/activity/SynchroExec.hpp"
+#include "src/kernel/activity/SynchroComm.hpp"
+#include "src/kernel/activity/SynchroSleep.hpp"
+#include "src/kernel/activity/SynchroRaw.hpp"
+#include "src/kernel/activity/SynchroIo.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_popping, simix,
                                 "Popping part of SIMIX (transmuting from user request into kernel handlers)");
@@ -30,12 +30,12 @@ void SIMIX_simcall_answer(smx_simcall_t simcall)
  *    weird in process scheduling.
  */
 /*    if(!xbt_dynar_member(simix_global->process_to_run, &(simcall->issuer))) */
-    xbt_dynar_push_as(simix_global->process_to_run, smx_process_t, simcall->issuer);
+    xbt_dynar_push_as(simix_global->process_to_run, smx_actor_t, simcall->issuer);
 /*    else DIE_IMPOSSIBLE; */
   }
 }
 
-void SIMIX_simcall_exit(smx_synchro_t synchro)
+void SIMIX_simcall_exit(smx_activity_t synchro)
 {
   synchro->post();
 }