X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c46aba70aa4ccf22cc19fac31d451c7158e922dd..c3119f83962a5b1ef7bc8f79011698c83ce21cda:/src/surf/network_ib.hpp diff --git a/src/surf/network_ib.hpp b/src/surf/network_ib.hpp index b8357fb559..f132f83f84 100644 --- a/src/surf/network_ib.hpp +++ b/src/surf/network_ib.hpp @@ -7,9 +7,10 @@ #ifndef SURF_NETWORK_IB_HPP_ #define SURF_NETWORK_IB_HPP_ -#include +#include "src/surf/network_smpi.hpp" +#include "xbt/base.h" -#include "network_smpi.hpp" +#include namespace simgrid { namespace surf { @@ -22,8 +23,8 @@ namespace simgrid { IBNode* destination; NetworkAction *action; double init_rate; - ActiveComm() : destination(NULL),action(NULL),init_rate(-1){}; - ~ActiveComm(){}; + ActiveComm() : destination(nullptr),action(nullptr),init_rate(-1){}; + virtual ~ActiveComm() = default; }; class IBNode{ @@ -35,8 +36,8 @@ namespace simgrid { std::map ActiveCommsDown; //number of comms the node is receiving int nbActiveCommsDown; - IBNode(int id) : id(id),nbActiveCommsDown(0){}; - ~IBNode(){}; + explicit IBNode(int id) : id(id),nbActiveCommsDown(0){}; + virtual ~IBNode() = default; }; class XBT_PRIVATE NetworkIBModel : public NetworkSmpiModel { @@ -45,8 +46,8 @@ namespace simgrid { void computeIBfactors(IBNode *root); public: NetworkIBModel(); - NetworkIBModel(const char *name); - ~NetworkIBModel(); + explicit NetworkIBModel(const char *name); + ~NetworkIBModel() override; void updateIBfactors(NetworkAction *action, IBNode *from, IBNode * to, int remove); xbt_dict_t active_nodes;