From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Sat, 14 Oct 2017 20:49:28 +0000 (+0200)
Subject: Constify getName()/getCname() in s4u::NetZone.
X-Git-Tag: v3.18~458
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/cc29a4df89787e00a4b816b3cd106fabe10c42ed

Constify getName()/getCname() in s4u::NetZone.
---

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<NetZone*>* 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*>* NetZone::getChildren()
 {
   return children_;
 }
-const char* NetZone::getCname()
+const char* NetZone::getCname() const
 {
   return name_.c_str();
 }