X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f409d6f711ba652a6fd78e185791cf7870b6765d..b1a51bf03db0f4d86f3e89016affd30f091bd8db:/src/instr/instr_paje_containers.hpp diff --git a/src/instr/instr_paje_containers.hpp b/src/instr/instr_paje_containers.hpp index cdb78d350c..c4befb69a6 100644 --- a/src/instr/instr_paje_containers.hpp +++ b/src/instr/instr_paje_containers.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2020. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2010-2021. 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. */ @@ -30,13 +30,13 @@ public: static xbt::signal on_creation; static xbt::signal on_destruction; - explicit Container(const std::string& name, const std::string& type_name, Container* father); + explicit Container(const std::string& name, const std::string& type_name, Container* parent); Container(const Container&) = delete; Container& operator=(const Container&) = delete; virtual ~Container(); Type* type_; /* Type of this container */ - Container* father_; + Container* parent_; std::map> children_; static Container* by_name_or_null(const std::string& name); @@ -55,17 +55,17 @@ public: class NetZoneContainer : public Container { public: - NetZoneContainer(const std::string& name, unsigned int level, NetZoneContainer* father); + NetZoneContainer(const std::string& name, unsigned int level, NetZoneContainer* parent); }; class RouterContainer : public Container { public: - RouterContainer(const std::string& name, Container* father); + RouterContainer(const std::string& name, Container* parent); }; class HostContainer : public Container { public: - HostContainer(s4u::Host const& host, NetZoneContainer* father); + HostContainer(s4u::Host const& host, NetZoneContainer* parent); }; } // namespace instr } // namespace simgrid