X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3aa62b6a4755ba871847a5f86473c0e651c9d661..79853b8925152a5b89d3f8f44d64ffaf284a0196:/src/surf/network_cm02.hpp diff --git a/src/surf/network_cm02.hpp b/src/surf/network_cm02.hpp index 9f160e4722..04f6d98786 100644 --- a/src/surf/network_cm02.hpp +++ b/src/surf/network_cm02.hpp @@ -1,5 +1,4 @@ -/* Copyright (c) 2013-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2013-2017. 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. */ @@ -13,7 +12,6 @@ #include "xbt/graph.h" - /*********** * Classes * ***********/ @@ -59,8 +57,8 @@ namespace simgrid { public: NetworkCm02Link(NetworkCm02Model* model, const char* name, double bandwidth, double latency, e_surf_link_sharing_policy_t policy, lmm_system_t system); - ~NetworkCm02Link() override; - void apply_event(tmgr_trace_iterator_t event, double value) override; + virtual ~NetworkCm02Link() = default; + void apply_event(tmgr_trace_event_t event, double value) override; void setBandwidth(double value) override; void setLatency(double value) override; virtual void gapAppend(double size, const LinkImpl* link, NetworkAction* action); @@ -76,7 +74,7 @@ namespace simgrid { public: NetworkCm02Action(Model *model, double cost, bool failed) : NetworkAction(model, cost, failed) {}; - ~NetworkCm02Action() override; + virtual ~NetworkCm02Action() = default; void updateRemainingLazy(double now) override; protected: double senderGap_;