X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d0ffc37686edcc803601f76ab51fdfed5fc2f241..05736ee0ede974fcf9fb60a13a40c50d62fcc19d:/src/surf/network_smpi.hpp

diff --git a/src/surf/network_smpi.hpp b/src/surf/network_smpi.hpp
index f5d38fa3ff..7a2f4db3ec 100644
--- a/src/surf/network_smpi.hpp
+++ b/src/surf/network_smpi.hpp
@@ -1,40 +1,26 @@
-#include "network.hpp"
+/* Copyright (c) 2013-2015. The SimGrid Team.
+ * All rights reserved.                                                     */
 
-/***********
- * Classes *
- ***********/
+/* 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. */
 
-class NetworkSmpiModel;
-typedef NetworkSmpiModel *NetworkSmpiModelPtr;
+#include <xbt/base.h>
 
-/*********
- * Tools *
- *********/
-
-/*********
- * Model *
- *********/
-
-class NetworkSmpiModel : public NetworkCm02Model {
-public:
-  NetworkSmpiModel() : NetworkCm02Model() {m_haveGap=true;};
-  void gapAppend(double size, const NetworkCm02LinkLmmPtr link, NetworkCm02ActionLmmPtr action);
-  void gapRemove(ActionLmmPtr action);
-  double latencyFactor(double size);
-  double bandwidthFactor(double size);
-  double bandwidthConstraint(double rate, double bound, double size);
-  void communicateCallBack() {};
-};
-
-
-/************
- * Resource *
- ************/
-
-
-/**********
- * Action *
- **********/
+#include "network_cm02.hpp"
 
+namespace simgrid {
+  namespace surf {
 
+    class XBT_PRIVATE NetworkSmpiModel : public NetworkCm02Model {
+    public:
+      NetworkSmpiModel();
+      ~NetworkSmpiModel();
 
+      using NetworkCm02Model::gapAppend; // Explicit about overloaded method (silence Woverloaded-virtual from clang)
+      double latencyFactor(double size);
+      double bandwidthFactor(double size);
+      double bandwidthConstraint(double rate, double bound, double size);
+      void communicateCallBack() {};
+    };
+  }
+}