Merge branch 'coverity_scan' of github.com:mquinson/simgrid

[simgrid.git] / src / surf / storage_n11.hpp

diff --git a/src/surf/storage_n11.hpp b/src/surf/storage_n11.hpp
index d9d3941..6a5eabd 100644 (file)
--- a/src/surf/storage_n11.hpp
+++ b/src/surf/storage_n11.hpp
@@ -1,21 +1,26 @@
-/* Copyright (c) 2013-2014. The SimGrid Team.
+/* Copyright (c) 2013-2015. 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. */
 
+#include <xbt/base.h>
+
 #include "storage_interface.hpp"
 
 #ifndef STORAGE_N11_HPP_
 #define STORAGE_N11_HPP_
 
+namespace simgrid {
+namespace surf {
+
 /***********
  * Classes *
  ***********/
 
-class StorageN11Model;
-class StorageN11;
-class StorageN11Action;
+class XBT_PRIVATE StorageN11Model;
+class XBT_PRIVATE StorageN11;
+class XBT_PRIVATE StorageN11Action;
 
 /*********
  * Model *
@@ -26,10 +31,9 @@ public:
   StorageN11Model();
   ~StorageN11Model();
   Storage *createStorage(const char* id, const char* type_id,
-                  const char* content_name, const char* content_type, xbt_dict_t properties, const char* attach);
-  void addTraces(){DIE_IMPOSSIBLE;}
-  double shareResources(double now);
-  void updateActionsState(double now, double delta);
+       const char* content_name, const char* content_type, xbt_dict_t properties, const char* attach) override;
+  double next_occuring_event(double now) override;
+  void updateActionsState(double now, double delta) override;
 };
 
 /************
@@ -39,8 +43,8 @@ public:
 class StorageN11 : public Storage {
 public:
   StorageN11(StorageModel *model, const char* name, xbt_dict_t properties,
-                    lmm_system_t maxminSystem, double bread, double bwrite, double bconnection,
-                    const char* type_id, char *content_name, char *content_type, sg_size_t size, char *attach);
+         lmm_system_t maxminSystem, double bread, double bwrite, double bconnection,
+         const char* type_id, char *content_name, char *content_type, sg_size_t size, char *attach);
 
   StorageAction *open(const char* mount, const char* path);
   StorageAction *close(surf_file_t fd);
@@ -70,4 +74,7 @@ public:
 
 };
 
+}
+}
+
 #endif /* STORAGE_N11_HPP_ */