X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6de03ecc4e630732984a0673512a5d15fd75e270..55633c554b60455d85885816b1b73e9698b73a14:/src/surf/network_smpi.hpp

diff --git a/src/surf/network_smpi.hpp b/src/surf/network_smpi.hpp
index a27ef04fb9..c369fdb109 100644
--- a/src/surf/network_smpi.hpp
+++ b/src/surf/network_smpi.hpp
@@ -1,48 +1,39 @@
-/* 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 "network_cm02.hpp"
-
-/***********
- * Classes *
- ***********/
-
-class NetworkSmpiModel;
-typedef NetworkSmpiModel *NetworkSmpiModelPtr;
+#include <xbt/base.h>
 
-/*********
- * Tools *
- *********/
-
-/*********
- * Model *
- *********/
-
-class NetworkSmpiModel : public NetworkCm02Model {
-public:
-  NetworkSmpiModel();
-  ~NetworkSmpiModel();
+#include "network_cm02.hpp"
 
-  void gapAppend(double size, const NetworkLinkPtr link, NetworkActionPtr action);
-  void gapRemove(ActionPtr action);
-  double latencyFactor(double size);
-  double bandwidthFactor(double size);
-  double bandwidthConstraint(double rate, double bound, double size);
-  void communicateCallBack() {};
-};
+namespace simgrid {
+  namespace surf {
 
+    class XBT_PRIVATE NetworkSmpiModel : public NetworkCm02Model {
+    public:
+      NetworkSmpiModel();
+      ~NetworkSmpiModel();
 
-/************
- * Resource *
- ************/
+      using NetworkCm02Model::gapAppend; // Explicit about overloaded method (silence Woverloaded-virtual from clang)
+      void gapAppend(double size, Link* link, NetworkAction *action);
+      void gapRemove(Action *action);
+      double latencyFactor(double size);
+      double bandwidthFactor(double size);
+      double bandwidthConstraint(double rate, double bound, double size);
+      void communicateCallBack() {};
+    };
 
 
-/**********
- * Action *
- **********/
+    /************
+     * Resource *
+     ************/
 
 
+    /**********
+     * Action *
+     **********/
 
+  }
+}