X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cf108868b4eeed4d0d9d343bc68557d7814e18c0..a511865336e83ac3654632265ed00b8f0bf0eccc:/src/surf/storage_interface.cpp

diff --git a/src/surf/storage_interface.cpp b/src/surf/storage_interface.cpp
index 026ed9a18c..c674ff92bc 100644
--- a/src/surf/storage_interface.cpp
+++ b/src/surf/storage_interface.cpp
@@ -27,10 +27,10 @@ namespace surf {
  * Callbacks *
  *************/
 
-simgrid::xbt::signal<void(simgrid::surf::Storage*)> storageCreatedCallbacks;
-simgrid::xbt::signal<void(simgrid::surf::Storage*)> storageDestructedCallbacks;
-simgrid::xbt::signal<void(simgrid::surf::Storage*, int, int)> storageStateChangedCallbacks; // signature: wasOn, isOn
-simgrid::xbt::signal<void(simgrid::surf::StorageAction*, e_surf_action_state_t, e_surf_action_state_t)> storageActionStateChangedCallbacks;
+simgrid::xbt::signal<void(Storage*)> storageCreatedCallbacks;
+simgrid::xbt::signal<void(Storage*)> storageDestructedCallbacks;
+simgrid::xbt::signal<void(Storage*, int, int)> storageStateChangedCallbacks; // signature: wasOn, isOn
+simgrid::xbt::signal<void(StorageAction*, Action::State, Action::State)> storageActionStateChangedCallbacks;
 
 /*********
  * Model *
@@ -43,10 +43,8 @@ StorageModel::StorageModel()
 }
 
 StorageModel::~StorageModel(){
-  lmm_system_free(p_maxminSystem);
-
+  lmm_system_free(maxminSystem_);
   surf_storage_model = NULL;
-
   xbt_dynar_free(&p_storageList);
 }
 
@@ -196,8 +194,8 @@ StorageAction::StorageAction(Model *model, double cost, bool failed, lmm_variabl
   progress = 0;
 }
 
-void StorageAction::setState(e_surf_action_state_t state){
-  e_surf_action_state_t old = getState();
+void StorageAction::setState(Action::State state){
+  Action::State old = getState();
   Action::setState(state);
   storageActionStateChangedCallbacks(this, old, state);
 }