reduce the scope of some #include, and cut useless ones

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

diff --git a/src/simix/smx_io.cpp b/src/simix/smx_io.cpp
index 1f35bf2..a9c2a2c 100644 (file)
--- a/src/simix/smx_io.cpp
+++ b/src/simix/smx_io.cpp
@@ -9,13 +9,12 @@
 
 #include "simgrid/s4u/Host.hpp"
 #include "simgrid/s4u/Storage.hpp"
-#include "src/surf/FileImpl.hpp"
+#include "smx_private.hpp"
+#include "src/simix/smx_io_private.hpp"
 #include "src/surf/HostImpl.hpp"
 #include "src/surf/StorageImpl.hpp"
-#include "surf/surf.hpp"
-
-#include "smx_private.hpp"
 #include "src/surf/surf_interface.hpp"
+#include "surf/surf.hpp"
 
 #include "src/kernel/activity/SynchroIo.hpp"
 
@@ -33,7 +32,7 @@ smx_activity_t SIMIX_storage_read(surf_storage_t st, sg_size_t size)
   simgrid::kernel::activity::IoImpl* synchro = new simgrid::kernel::activity::IoImpl();
   synchro->surf_io                           = st->read(size);
 
-  synchro->surf_io->setData(synchro);
+  synchro->surf_io->set_data(synchro);
   XBT_DEBUG("Create io synchro %p", synchro);
 
   return synchro;
@@ -50,7 +49,7 @@ smx_activity_t SIMIX_storage_write(surf_storage_t st, sg_size_t size)
 {
   simgrid::kernel::activity::IoImpl* synchro = new simgrid::kernel::activity::IoImpl();
   synchro->surf_io                           = st->write(size);
-  synchro->surf_io->setData(synchro);
+  synchro->surf_io->set_data(synchro);
   XBT_DEBUG("Create io synchro %p", synchro);
 
   return synchro;