From: Martin Quinson <martin.quinson@loria.fr>
Date: Wed, 30 May 2018 16:30:16 +0000 (+0200)
Subject: Start snake_casing s4u::NetZone
X-Git-Tag: v3.20~183
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/9ba84afe21104d341e205f1732803e5aa1db09f3?hp=caebb3b591d81e9e35dfac26a335d9acad14045f

Start snake_casing s4u::NetZone
---

diff --git a/include/simgrid/s4u/NetZone.hpp b/include/simgrid/s4u/NetZone.hpp
index 4fea672f9c..990624a475 100644
--- a/include/simgrid/s4u/NetZone.hpp
+++ b/include/simgrid/s4u/NetZone.hpp
@@ -37,8 +37,9 @@ public:
   const std::string& get_name() const { return name_; }
   /** @brief Retrieves the name of that netzone as a C string */
   const char* get_cname() const;
-  NetZone* getFather();
+  NetZone* get_father();
 
+  XBT_ATTRIB_DEPRECATED_v323("Please use NetZone::get_father()") NetZone* getFather() { return get_father(); }
   XBT_ATTRIB_DEPRECATED_v323("Please use NetZone::get_name()") const std::string& getName() const { return get_name(); }
   XBT_ATTRIB_DEPRECATED_v323("Please use NetZone::get_cname()") const char* getCname() const { return get_cname(); }
   XBT_ATTRIB_DEPRECATED_v323("Please use NetZone::add_route()") void addRoute(
diff --git a/src/kernel/routing/NetZoneImpl.cpp b/src/kernel/routing/NetZoneImpl.cpp
index 3dbcfdb259..5528e9f02d 100644
--- a/src/kernel/routing/NetZoneImpl.cpp
+++ b/src/kernel/routing/NetZoneImpl.cpp
@@ -169,13 +169,13 @@ static void find_common_ancestors(NetPoint* src, NetPoint* dst,
   NetZoneImpl* current = src->get_englobing_zone();
   while (current != nullptr) {
     path_src.push_back(current);
-    current = static_cast<NetZoneImpl*>(current->getFather());
+    current = static_cast<NetZoneImpl*>(current->get_father());
   }
   std::vector<NetZoneImpl*> path_dst;
   current = dst->get_englobing_zone();
   while (current != nullptr) {
     path_dst.push_back(current);
-    current = static_cast<NetZoneImpl*>(current->getFather());
+    current = static_cast<NetZoneImpl*>(current->get_father());
   }
 
   /* (3) find the common father.
diff --git a/src/s4u/s4u_Netzone.cpp b/src/s4u/s4u_Netzone.cpp
index da67bc6aed..5e1387a89c 100644
--- a/src/s4u/s4u_Netzone.cpp
+++ b/src/s4u/s4u_Netzone.cpp
@@ -66,7 +66,7 @@ const char* NetZone::get_cname() const
 {
   return name_.c_str();
 }
-NetZone* NetZone::getFather()
+NetZone* NetZone::get_father()
 {
   return father_;
 }
diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp
index cff7f9e696..416a7a19e1 100644
--- a/src/surf/sg_platf.cpp
+++ b/src/surf/sg_platf.cpp
@@ -626,7 +626,7 @@ void sg_platf_new_Zone_seal()
   xbt_assert(current_routing, "Cannot seal the current AS: none under construction");
   current_routing->seal();
   simgrid::s4u::NetZone::onSeal(*current_routing);
-  current_routing = static_cast<simgrid::kernel::routing::NetZoneImpl*>(current_routing->getFather());
+  current_routing = static_cast<simgrid::kernel::routing::NetZoneImpl*>(current_routing->get_father());
 }
 
 /** @brief Add a link connecting an host to the rest of its AS (which must be cluster or vivaldi) */