A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Constify getName()/getCname() in s4u::NetZone.
[simgrid.git]
/
include
/
simgrid
/
s4u
/
NetZone.hpp
diff --git
a/include/simgrid/s4u/NetZone.hpp
b/include/simgrid/s4u/NetZone.hpp
index
fa5ca04
..
fc8c8fa
100644
(file)
--- 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. */
/* 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. */
@@
-38,13
+38,16
@@
XBT_PUBLIC_CLASS NetZone
protected:
friend simgrid::kernel::routing::NetZoneImpl;
protected:
friend simgrid::kernel::routing::NetZoneImpl;
- explicit NetZone(NetZone * father,
const char*
name);
+ explicit NetZone(NetZone * father,
std::string
name);
virtual ~NetZone();
public:
/** @brief Seal your netzone once you're done adding content, and before routing stuff through it */
virtual void seal();
virtual ~NetZone();
public:
/** @brief Seal your netzone once you're done adding content, and before routing stuff through it */
virtual void seal();
- char* getCname();
+ /** @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
NetZone* getFather();
std::vector<NetZone*>* getChildren(); // Sub netzones
@@
-80,7
+83,7
@@
private:
std::unordered_map<std::string, std::string> properties_;
NetZone* father_ = nullptr;
std::unordered_map<std::string, std::string> properties_;
NetZone* father_ = nullptr;
-
char* name_ = nullptr
;
+
std::string name_
;
bool sealed_ = false; // We cannot add more content when sealed
bool sealed_ = false; // We cannot add more content when sealed