get it to compile on clang on my machine

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

diff --git a/src/surf/network_smpi.hpp b/src/surf/network_smpi.hpp
index f5d38fa..6ae0b19 100644 (file)
--- a/src/surf/network_smpi.hpp
+++ b/src/surf/network_smpi.hpp
@@ -1,11 +1,16 @@
-#include "network.hpp"
+/* Copyright (c) 2013-2014. 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;
 
 /*********
  * Tools *
@@ -17,9 +22,12 @@ typedef NetworkSmpiModel *NetworkSmpiModelPtr;
 
 class NetworkSmpiModel : public NetworkCm02Model {
 public:
-  NetworkSmpiModel() : NetworkCm02Model() {m_haveGap=true;};
-  void gapAppend(double size, const NetworkCm02LinkLmmPtr link, NetworkCm02ActionLmmPtr action);
-  void gapRemove(ActionLmmPtr action);
+  NetworkSmpiModel();
+  ~NetworkSmpiModel();
+
+  using NetworkModel::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);