X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/efd5719fdcd06a99d1fd644b81c7e9d578c08fc5..4a6b0a991a67e6f2f67c03fed43529e078da7115:/src/surf/storage_interface.hpp

diff --git a/src/surf/storage_interface.hpp b/src/surf/storage_interface.hpp
index 545cb1b571..3ba65bf50b 100644
--- a/src/surf/storage_interface.hpp
+++ b/src/surf/storage_interface.hpp
@@ -13,8 +13,6 @@
 #ifndef STORAGE_INTERFACE_HPP_
 #define STORAGE_INTERFACE_HPP_
 
-extern xbt_dynar_t mount_list;
-
 namespace simgrid {
 namespace surf {
 
@@ -83,7 +81,7 @@ public:
                                     xbt_dict_t properties,
                                     const char *attach) = 0;
 
-  bool shareResourcesIsIdempotent() {return true;}
+  bool next_occuring_event_isIdempotent() {return true;}
 
   xbt_dynar_t p_storageList;
 };
@@ -96,7 +94,7 @@ public:
  * @details A Storage represent a storage unit (e.g.: hard drive, usb key)
  */
 class Storage : public simgrid::surf::Resource,
-				public simgrid::surf::PropertyHolder {
+        public simgrid::surf::PropertyHolder {
 public:
   /**
    * @brief Storage constructor
@@ -138,16 +136,9 @@ public:
   ~Storage();
 
   /** @brief Check if the Storage is used (if an action currently uses its resources) */
-  bool isUsed();
+  bool isUsed() override;
 
-  /**
-   * @brief Update the state of the current Storage
-   *
-   * @param event_type [description]
-   * @param value [description]
-   * @param date [description]
-   */
-  void updateState(tmgr_trace_event_t event_type, double value, double date);
+  void apply_event(tmgr_trace_iterator_t event, double value) override;
 
   void turnOn() override;
   void turnOff() override;