[surf] Triggers the destructed callbacks on the full object

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

diff --git a/src/surf/network_smpi.hpp b/src/surf/network_smpi.hpp
index 54b2b9b..30cf4ee 100644 (file)
--- a/src/surf/network_smpi.hpp
+++ b/src/surf/network_smpi.hpp
@@ -1,11 +1,21 @@
-#include "network.hpp"
+/* 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 "network_cm02.hpp"
+
+namespace simgrid {
+namespace surf {
 
 /***********
  * Classes *
  ***********/
 
-class NetworkSmpiModel;
-typedef NetworkSmpiModel *NetworkSmpiModelPtr;
+class XBT_PRIVATE NetworkSmpiModel;
 
 /*********
  * Tools *
@@ -20,8 +30,9 @@ public:
   NetworkSmpiModel();
   ~NetworkSmpiModel();
 
-  void gapAppend(double size, const NetworkCm02LinkLmmPtr link, NetworkCm02ActionLmmPtr action);
-  void gapRemove(ActionLmmPtr action);
+  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);
@@ -38,5 +49,5 @@ public:
  * Action *
  **********/
 
-
-
+}
+}