Merge branch 'master' of github.com:simgrid/simgrid

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

diff --git a/src/surf/storage_interface.cpp b/src/surf/storage_interface.cpp
index 70cb9d7..554c9a2 100644 (file)
--- a/src/surf/storage_interface.cpp
+++ b/src/surf/storage_interface.cpp
@@ -6,7 +6,6 @@
 
 #include "storage_interface.hpp"
 #include "surf_private.h"
-#include "xbt/file.h" /* xbt_getline */
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/join.hpp>
 #include <boost/algorithm/string/split.hpp>
@@ -14,16 +13,10 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_storage, surf, "Logging specific to the SURF storage module");
 
-xbt_lib_t file_lib;
-int MSG_FILE_LEVEL = -1; // Msg file level
-
 xbt_lib_t storage_lib;
-int SIMIX_STORAGE_LEVEL        = -1; // Simix storage level
 int MSG_STORAGE_LEVEL          = -1; // Msg storage level
 int ROUTING_STORAGE_LEVEL      = -1; // Routing for storage level
 int SURF_STORAGE_LEVEL = -1;
-xbt_lib_t storage_type_lib;
-int ROUTING_STORAGE_TYPE_LEVEL = -1; //Routing for storage_type level
 simgrid::surf::StorageModel *surf_storage_model = nullptr;
 
 namespace simgrid {
@@ -122,7 +115,7 @@ bool Storage::isUsed()
   return false;
 }
 
-void Storage::apply_event(tmgr_trace_iterator_t /*event*/, double /*value*/)
+void Storage::apply_event(tmgr_trace_event_t /*event*/, double /*value*/)
 {
   THROW_UNIMPLEMENTED;
 }