X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/07eb08dd092e89871ab3ed9fcf41ad0219598e3b..220230a3d6da87b71f2e2d09ceaf166d75f3a6a8:/src/surf/surf_c_bindings.cpp

diff --git a/src/surf/surf_c_bindings.cpp b/src/surf/surf_c_bindings.cpp
index aeba3b6b5e..659be87a77 100644
--- a/src/surf/surf_c_bindings.cpp
+++ b/src/surf/surf_c_bindings.cpp
@@ -21,7 +21,7 @@ void surf_presolve()
   double next_event_date = -1.0;
   tmgr_trace_event_t event          = nullptr;
   double value = -1.0;
-  simgrid::kernel::model::Resource* resource = nullptr;
+  simgrid::kernel::resource::Resource* resource = nullptr;
 
   XBT_DEBUG ("Consume all trace events occurring before the starting time.");
   while ((next_event_date = future_evt_set->next_date()) != -1.0) {
@@ -44,7 +44,7 @@ double surf_solve(double max_date)
   double time_delta = -1.0; /* duration */
   double model_next_action_end = -1.0;
   double value = -1.0;
-  simgrid::kernel::model::Resource* resource = nullptr;
+  simgrid::kernel::resource::Resource* resource = nullptr;
   tmgr_trace_event_t event          = nullptr;
 
   if (max_date > 0.0) {
@@ -150,28 +150,31 @@ double surf_solve(double max_date)
 /*********
  * MODEL *
  *********/
-static surf_action_t ActionListExtract(simgrid::surf::ActionList* list)
+static simgrid::kernel::resource::Action* ActionListExtract(simgrid::kernel::resource::ActionList* list)
 {
   if (list->empty())
     return nullptr;
-  surf_action_t res = &list->front();
+  simgrid::kernel::resource::Action* res = &list->front();
   list->pop_front();
   return res;
 }
 
-surf_action_t surf_model_extract_done_action_set(surf_model_t model)
+simgrid::kernel::resource::Action* surf_model_extract_done_action_set(simgrid::kernel::resource::Model* model)
 {
   return ActionListExtract(model->getDoneActionSet());
 }
 
-surf_action_t surf_model_extract_failed_action_set(surf_model_t model){
+simgrid::kernel::resource::Action* surf_model_extract_failed_action_set(simgrid::kernel::resource::Model* model)
+{
   return ActionListExtract(model->getFailedActionSet());
 }
 
-int surf_model_running_action_set_size(surf_model_t model){
+int surf_model_running_action_set_size(simgrid::kernel::resource::Model* model)
+{
   return model->getRunningActionSet()->size();
 }
 
-void surf_cpu_action_set_bound(surf_action_t action, double bound) {
+void surf_cpu_action_set_bound(simgrid::kernel::resource::Action* action, double bound)
+{
   static_cast<simgrid::surf::CpuAction*>(action)->setBound(bound);
 }