X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a43ef1c628f2962dceb1994099e6a67dc292424e..16ad73e3b3cc887ff53b1c7bb9ccee90d4d50ef3:/src/s4u/s4u_Netzone.cpp

diff --git a/src/s4u/s4u_Netzone.cpp b/src/s4u/s4u_Netzone.cpp
index 5a60eeb44a..5eb5139489 100644
--- a/src/s4u/s4u_Netzone.cpp
+++ b/src/s4u/s4u_Netzone.cpp
@@ -17,9 +17,9 @@ namespace s4u {
 simgrid::xbt::signal<void(bool symmetrical, kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst,
                           kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst,
                           std::vector<kernel::resource::LinkImpl*>& link_list)>
-    NetZone::onRouteCreation;
-simgrid::xbt::signal<void(NetZone&)> NetZone::onCreation;
-simgrid::xbt::signal<void(NetZone&)> NetZone::onSeal;
+    NetZone::on_route_creation;
+simgrid::xbt::signal<void(NetZone&)> NetZone::on_creation;
+simgrid::xbt::signal<void(NetZone&)> NetZone::on_seal;
 
 NetZone::NetZone(NetZone* father, std::string name) : father_(father), name_(name)
 {
@@ -40,7 +40,7 @@ NetZone::~NetZone()
 
 std::unordered_map<std::string, std::string>* NetZone::getProperties()
 {
-  return simgrid::simix::kernelImmediate([this] { return &properties_; });
+  return simgrid::simix::simcall([this] { return &properties_; });
 }
 
 /** Retrieve the property value (or nullptr if not set) */
@@ -50,7 +50,7 @@ const char* NetZone::getProperty(const char* key)
 }
 void NetZone::setProperty(const char* key, const char* value)
 {
-  simgrid::simix::kernelImmediate([this, key, value] { properties_[key] = value; });
+  simgrid::simix::simcall([this, key, value] { properties_[key] = value; });
 }
 
 /** @brief Returns the list of direct children (no grand-children)
@@ -66,7 +66,7 @@ const char* NetZone::get_cname() const
 {
   return name_.c_str();
 }
-NetZone* NetZone::getFather()
+NetZone* NetZone::get_father()
 {
   return father_;
 }