X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f7ec298174c4a06224656796dc5cd1594a863070..45ba4879c64faca75002be9379e6a7cd3e1d41d6:/src/surf/network_smpi.hpp diff --git a/src/surf/network_smpi.hpp b/src/surf/network_smpi.hpp index 54b2b9bd95..a8dd24c601 100644 --- a/src/surf/network_smpi.hpp +++ b/src/surf/network_smpi.hpp @@ -1,11 +1,16 @@ -#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 "network_cm02.hpp" /*********** * Classes * ***********/ class NetworkSmpiModel; -typedef NetworkSmpiModel *NetworkSmpiModelPtr; /********* * Tools * @@ -20,8 +25,9 @@ public: NetworkSmpiModel(); ~NetworkSmpiModel(); - void gapAppend(double size, const NetworkCm02LinkLmmPtr link, NetworkCm02ActionLmmPtr action); - void gapRemove(ActionLmmPtr action); + 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);