The sed version used on macos doesn't like the I flag..

[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 a18cf79..3b323f7 100644 (file)
--- a/src/surf/surf_c_bindings.cpp
+++ b/src/surf/surf_c_bindings.cpp
@@ -4,12 +4,12 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "src/surf/HostImpl.hpp"
-#include "surf_interface.hpp"
+#include "VirtualMachineImpl.hpp"
 #include "network_interface.hpp"
-#include "src/instr/instr_private.h"
 #include "plugins/energy.hpp"
-#include "virtual_machine.hpp"
+#include "src/instr/instr_private.h"
+#include "src/surf/HostImpl.hpp"
+#include "surf_interface.hpp"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_kernel);
 
@@ -18,11 +18,12 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_kernel);
  *********/
 
 static simgrid::surf::HostImpl *get_casted_host(sg_host_t host){ //FIXME: killme
-  return host->extension<simgrid::surf::HostImpl>();
+  return host->pimpl_;
 }
 
-static simgrid::surf::VirtualMachine *get_casted_vm(sg_host_t host){
-  return static_cast<simgrid::surf::VirtualMachine*>(host->extension<simgrid::surf::HostImpl>());
+static simgrid::surf::VirtualMachineImpl* get_casted_vm(sg_host_t host)
+{
+  return static_cast<simgrid::surf::VirtualMachineImpl*>(host->pimpl_);
 }
 
 extern double NOW;
@@ -176,10 +177,6 @@ int surf_model_running_action_set_size(surf_model_t model){
   return model->getRunningActionSet()->size();
 }
 
-surf_action_t surf_network_model_communicate(surf_network_model_t model, sg_host_t src, sg_host_t dst, double size, double rate){
-  return model->communicate(src->pimpl_netcard, dst->pimpl_netcard, size, rate);
-}
-
 surf_action_t surf_host_sleep(sg_host_t host, double duration){
   return host->pimpl_cpu->sleep(duration);
 }
@@ -282,5 +279,5 @@ void surf_cpu_action_set_bound(surf_action_t action, double bound) {
 }
 
 surf_file_t surf_storage_action_get_file(surf_action_t action){
-  return static_cast<simgrid::surf::StorageAction*>(action)->p_file;
+  return static_cast<simgrid::surf::StorageAction*>(action)->file_;
 }