X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ecd5f7562caf1d443bf22788fa5f4fac408776ec..0b348e806f86cd8c138b8485c8d41c041ccad610:/src/instr/instr_paje_containers.hpp diff --git a/src/instr/instr_paje_containers.hpp b/src/instr/instr_paje_containers.hpp index fe1bd0063c..0106898bf0 100644 --- a/src/instr/instr_paje_containers.hpp +++ b/src/instr/instr_paje_containers.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2010-2018. 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. */ @@ -26,13 +26,13 @@ public: Type* type_; /* Type of this container */ Container* father_; std::map children_; - sg_netpoint_t netpoint_ = nullptr; + kernel::routing::NetPoint* netpoint_ = nullptr; static Container* byNameOrNull(std::string name); static Container* byName(std::string name); - std::string getName() { return name_; } - const char* getCname() { return name_.c_str(); } - long long int getId() { return id_; } + std::string get_name() { return name_; } + const char* get_cname() { return name_.c_str(); } + long long int get_id() { return id_; } void removeFromParent(); void logCreation(); void logDestruction(); @@ -40,7 +40,7 @@ public: StateType* getState(std::string name); LinkType* getLink(std::string name); VariableType* getVariable(std::string name); - + void createChild(std::string name, std::string type_name); static Container* getRoot(); };