X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dc9b8feaddd53842f6204f4f24409b2382393fa9..5232905f5b6e218cd2378c59e407d40bfcb57b18:/src/surf/storage_n11.hpp?ds=sidebyside diff --git a/src/surf/storage_n11.hpp b/src/surf/storage_n11.hpp index 66827083ad..309b7c536b 100644 --- a/src/surf/storage_n11.hpp +++ b/src/surf/storage_n11.hpp @@ -11,7 +11,8 @@ #define STORAGE_N11_HPP_ namespace simgrid { -namespace surf { +namespace kernel { +namespace resource { /*********** * Classes * @@ -44,9 +45,9 @@ public: double bwrite, const std::string& type_id, const std::string& content_name, sg_size_t size, const std::string& attach); virtual ~StorageN11() = default; - StorageAction* io_start(sg_size_t size, s4u::Io::OpType type); - StorageAction* read(sg_size_t size); - StorageAction* write(sg_size_t size); + StorageAction* io_start(sg_size_t size, s4u::Io::OpType type) override; + StorageAction* read(sg_size_t size) override; + StorageAction* write(sg_size_t size) override; }; /********** @@ -55,8 +56,7 @@ public: class StorageN11Action : public StorageAction { public: - StorageN11Action(kernel::resource::Model* model, double cost, bool failed, StorageImpl* storage, - s4u::Io::OpType type); + StorageN11Action(Model* model, double cost, bool failed, StorageImpl* storage, s4u::Io::OpType type); void suspend() override; void cancel() override; void resume() override; @@ -65,7 +65,7 @@ public: void update_remains_lazy(double now) override; }; -} -} - +} // namespace resource +} // namespace kernel +} // namespace simgrid #endif /* STORAGE_N11_HPP_ */