A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'Adrien.Gougeon/simgrid-master'
[simgrid.git]
/
src
/
surf
/
network_cm02.hpp
diff --git
a/src/surf/network_cm02.hpp
b/src/surf/network_cm02.hpp
index 42354ab83edb339266423739af8c3b9a9bf6b57d..9ee5115343f22cd4cfea1d7c26423043441acab6 100644
(file)
--- a/
src/surf/network_cm02.hpp
+++ b/
src/surf/network_cm02.hpp
@@
-30,7
+30,7
@@
class XBT_PRIVATE NetworkSmpiModel;
class NetworkCm02Model : public NetworkModel {
public:
class NetworkCm02Model : public NetworkModel {
public:
-
explicit NetworkCm02Model(lmm::System* (*make_new_sys)(bool) = &lmm::make_new_maxmin_system
);
+
NetworkCm02Model(
);
~NetworkCm02Model() override = default;
LinkImpl* create_link(const std::string& name, const std::vector<double>& bandwidths, double latency,
s4u::Link::SharingPolicy policy) override;
~NetworkCm02Model() override = default;
LinkImpl* create_link(const std::string& name, const std::vector<double>& bandwidths, double latency,
s4u::Link::SharingPolicy policy) override;
@@
-60,8
+60,7
@@
class NetworkCm02Action : public NetworkAction {
friend Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate);
public:
friend Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate);
public:
- NetworkCm02Action(Model* model, s4u::Host& src, s4u::Host& dst, double cost, bool failed)
- : NetworkAction(model, src, dst, cost, failed){};
+ using NetworkAction::NetworkAction;
~NetworkCm02Action() override = default;
void update_remains_lazy(double now) override;
};
~NetworkCm02Action() override = default;
void update_remains_lazy(double now) override;
};