X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/88fad0aaff9eb463f048bfdfe4ad6218aba44ddb..4052b6d9960bd9792127d006c4f359b946cb7baa:/src/simix/smx_io.cpp

diff --git a/src/simix/smx_io.cpp b/src/simix/smx_io.cpp
index b0363e9d38..bdc916652b 100644
--- a/src/simix/smx_io.cpp
+++ b/src/simix/smx_io.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved.          */
 
 /* 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. */
@@ -9,12 +9,12 @@
 
 #include "simgrid/s4u/Host.hpp"
 #include "simgrid/s4u/Storage.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"
 
@@ -23,7 +23,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_io, simix, "Logging specific to SIMIX (io)
 void simcall_HANDLER_storage_read(smx_simcall_t simcall, surf_storage_t st, sg_size_t size)
 {
   smx_activity_t synchro = SIMIX_storage_read(st, size);
-  synchro->simcalls.push_back(simcall);
+  synchro->simcalls_.push_back(simcall);
   simcall->issuer->waiting_synchro = synchro;
 }
 
@@ -41,7 +41,7 @@ smx_activity_t SIMIX_storage_read(surf_storage_t st, sg_size_t size)
 void simcall_HANDLER_storage_write(smx_simcall_t simcall, surf_storage_t st, sg_size_t size)
 {
   smx_activity_t synchro = SIMIX_storage_write(st, size);
-  synchro->simcalls.push_back(simcall);
+  synchro->simcalls_.push_back(simcall);
   simcall->issuer->waiting_synchro = synchro;
 }
 
@@ -65,8 +65,8 @@ void SIMIX_io_destroy(smx_activity_t synchro)
 
 void SIMIX_io_finish(smx_activity_t synchro)
 {
-  for (smx_simcall_t const& simcall : synchro->simcalls) {
-    switch (synchro->state) {
+  for (smx_simcall_t const& simcall : synchro->simcalls_) {
+    switch (synchro->state_) {
       case SIMIX_DONE:
         /* do nothing, synchro done */
         break;
@@ -77,7 +77,7 @@ void SIMIX_io_finish(smx_activity_t synchro)
         SMX_EXCEPTION(simcall->issuer, cancel_error, 0, "Canceled");
         break;
       default:
-        xbt_die("Internal error in SIMIX_io_finish: unexpected synchro state %d", static_cast<int>(synchro->state));
+        xbt_die("Internal error in SIMIX_io_finish: unexpected synchro state %d", static_cast<int>(synchro->state_));
     }
 
     if (simcall->issuer->host->isOff()) {