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
Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
s4u
/
s4u_netzone.cpp
diff --git
a/src/s4u/s4u_netzone.cpp
b/src/s4u/s4u_netzone.cpp
index
1eec476
..
33dbf91
100644
(file)
--- a/
src/s4u/s4u_netzone.cpp
+++ b/
src/s4u/s4u_netzone.cpp
@@
-41,7
+41,7
@@
NetZone::~NetZone()
xbt_free(name_);
}
xbt_free(name_);
}
-std::unordered_map<std::string, std::string>* NetZone::
p
roperties()
+std::unordered_map<std::string, std::string>* NetZone::
getP
roperties()
{
return simgrid::simix::kernelImmediate([this] {
return &properties_;
{
return simgrid::simix::kernelImmediate([this] {
return &properties_;
@@
-49,7
+49,7
@@
std::unordered_map<std::string, std::string>* NetZone::properties()
}
/** Retrieve the property value (or nullptr if not set) */
}
/** Retrieve the property value (or nullptr if not set) */
-const char* NetZone::
p
roperty(const char* key)
+const char* NetZone::
getP
roperty(const char* key)
{
return properties_.at(key).c_str();
}
{
return properties_.at(key).c_str();
}
@@
-60,20
+60,20
@@
void NetZone::setProperty(const char* key, const char* value)
});
}
});
}
-std::vector<NetZone*>* NetZone::
c
hildren()
+std::vector<NetZone*>* NetZone::
getC
hildren()
{
return children_;
}
{
return children_;
}
-char* NetZone::name()
+char* NetZone::
getC
name()
{
return name_;
}
{
return name_;
}
-NetZone* NetZone::
f
ather()
+NetZone* NetZone::
getF
ather()
{
return father_;
}
{
return father_;
}
-void NetZone::
h
osts(std::vector<s4u::Host*>* whereto)
+void NetZone::
getH
osts(std::vector<s4u::Host*>* whereto)
{
for (auto card : vertices_) {
s4u::Host* host = simgrid::s4u::Host::by_name_or_null(card->name());
{
for (auto card : vertices_) {
s4u::Host* host = simgrid::s4u::Host::by_name_or_null(card->name());