From cc29a4df89787e00a4b816b3cd106fabe10c42ed Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Sat, 14 Oct 2017 22:49:28 +0200 Subject: [PATCH] Constify getName()/getCname() in s4u::NetZone. --- include/simgrid/s4u/NetZone.hpp | 8 +++++--- src/s4u/s4u_netzone.cpp | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/include/simgrid/s4u/NetZone.hpp b/include/simgrid/s4u/NetZone.hpp index cdfbf84c68..fc8c8fa4be 100644 --- a/include/simgrid/s4u/NetZone.hpp +++ b/include/simgrid/s4u/NetZone.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2016. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2016-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. */ @@ -44,8 +44,10 @@ protected: public: /** @brief Seal your netzone once you're done adding content, and before routing stuff through it */ virtual void seal(); - const char* getCname(); - std::string getName() { return name_; } + /** @brief Retrieves the name of that netzone as a C++ string */ + const std::string& getName() const { return name_; } + /** @brief Retrieves the name of that netzone as a C string */ + const char* getCname() const; NetZone* getFather(); std::vector* getChildren(); // Sub netzones diff --git a/src/s4u/s4u_netzone.cpp b/src/s4u/s4u_netzone.cpp index 8d431f1ca8..2675596338 100644 --- a/src/s4u/s4u_netzone.cpp +++ b/src/s4u/s4u_netzone.cpp @@ -63,7 +63,7 @@ std::vector* NetZone::getChildren() { return children_; } -const char* NetZone::getCname() +const char* NetZone::getCname() const { return name_.c_str(); } -- 2.20.1