kill dead code in the C interface to surf

[simgrid.git] / src / surf / surf_c_bindings.cpp

diff --git a/src/surf/surf_c_bindings.cpp b/src/surf/surf_c_bindings.cpp
index 8b71301..d9b620d 100644 (file)
--- a/src/surf/surf_c_bindings.cpp
+++ b/src/surf/surf_c_bindings.cpp
@@ -31,7 +31,7 @@ extern double NOW;
 void surf_presolve(void)
 {
   double next_event_date = -1.0;
-  tmgr_trace_event_t event = NULL;
+  tmgr_trace_iterator_t event = NULL;
   double value = -1.0;
   simgrid::surf::Resource *resource = NULL;
   simgrid::surf::Model *model = NULL;
@@ -64,7 +64,7 @@ double surf_solve(double max_date)
   double value = -1.0;
   simgrid::surf::Resource *resource = NULL;
   simgrid::surf::Model *model = NULL;
-  tmgr_trace_event_t event = NULL;
+  tmgr_trace_iterator_t event = NULL;
   unsigned int iter;
 
   if(!host_that_restart)
@@ -185,22 +185,6 @@ surf_action_t surf_model_extract_failed_action_set(surf_model_t model){
   return res;
 }
 
-surf_action_t surf_model_extract_ready_action_set(surf_model_t model){
-  if (model->getReadyActionSet()->empty())
-       return NULL;
-  surf_action_t res = &model->getReadyActionSet()->front();
-  model->getReadyActionSet()->pop_front();
-  return res;
-}
-
-surf_action_t surf_model_extract_running_action_set(surf_model_t model){
-  if (model->getRunningActionSet()->empty())
-       return NULL;
-  surf_action_t res = &model->getRunningActionSet()->front();
-  model->getRunningActionSet()->pop_front();
-  return res;
-}
-
 int surf_model_running_action_set_size(surf_model_t model){
   return model->getRunningActionSet()->size();
 }
@@ -419,7 +403,7 @@ void surf_cpu_action_set_bound(surf_action_t action, double bound) {
 
 #ifdef HAVE_LATENCY_BOUND_TRACKING
 double surf_network_action_get_latency_limited(surf_action_t action) {
-  return static_cast<NetworkActionPtr>(action)->getLatencyLimited();
+  return static_cast<simgrid::surf::NetworkAction*>(action)->getLatencyLimited();
 }
 #endif