X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/49e85177c669d793e84242983a1b1f430e47184e..c941a6b513a71ef786c4c749f8c01f5d018d976c:/src/surf/network_smpi.hpp diff --git a/src/surf/network_smpi.hpp b/src/surf/network_smpi.hpp index a27ef04fb9..30cf4eefa1 100644 --- a/src/surf/network_smpi.hpp +++ b/src/surf/network_smpi.hpp @@ -1,17 +1,21 @@ -/* 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 + #include "network_cm02.hpp" +namespace simgrid { +namespace surf { + /*********** * Classes * ***********/ -class NetworkSmpiModel; -typedef NetworkSmpiModel *NetworkSmpiModelPtr; +class XBT_PRIVATE NetworkSmpiModel; /********* * Tools * @@ -26,8 +30,9 @@ public: NetworkSmpiModel(); ~NetworkSmpiModel(); - void gapAppend(double size, const NetworkLinkPtr link, NetworkActionPtr action); - void gapRemove(ActionPtr 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); @@ -44,5 +49,5 @@ public: * Action * **********/ - - +} +}