Make member variables "private".

diff --git a/include/simgrid/kernel/routing/NetZoneImpl.hpp b/include/simgrid/kernel/routing/NetZoneImpl.hpp
index 39d737c..9e80905 100644 (file)
--- a/include/simgrid/kernel/routing/NetZoneImpl.hpp
+++ b/include/simgrid/kernel/routing/NetZoneImpl.hpp
@@ -54,8 +54,6 @@ protected:
   explicit NetZoneImpl(NetZoneImpl* father, std::string name);
   virtual ~NetZoneImpl();
 
-  s4u::NetZone piface_;
-
 public:
   s4u::NetZone* get_iface() { return &piface_; }
 
@@ -89,6 +87,8 @@ protected:
                         /* OUT */ std::vector<resource::LinkImpl*>& links, double* latency);
 
 private:
+  s4u::NetZone piface_;
+
   // our content, as known to our graph routing algorithm (maps vertex_id -> vertex)
   std::vector<kernel::routing::NetPoint*> vertices_;
 

diff --git a/include/simgrid/s4u/NetZone.hpp b/include/simgrid/s4u/NetZone.hpp
index f43ca18..2e3d15c 100644 (file)
--- a/include/simgrid/s4u/NetZone.hpp
+++ b/include/simgrid/s4u/NetZone.hpp
@@ -30,8 +30,6 @@ protected:
   explicit NetZone(kernel::routing::NetZoneImpl* impl);
   ~NetZone();
 
-  kernel::routing::NetZoneImpl* pimpl_;
-
 public:
   /** @brief Retrieves the name of that netzone as a C++ string */
   const std::string& get_name() const;
@@ -46,6 +44,7 @@ public:
   kernel::routing::NetZoneImpl* get_impl() { return pimpl_; }
 
 private:
+  kernel::routing::NetZoneImpl* pimpl_;
   std::unordered_map<std::string, std::string> properties_;
 
 public:

diff --git a/src/kernel/routing/RoutedZone.cpp b/src/kernel/routing/RoutedZone.cpp
index 1a2058b..db0fb9a 100644 (file)
--- a/src/kernel/routing/RoutedZone.cpp
+++ b/src/kernel/routing/RoutedZone.cpp
@@ -199,7 +199,7 @@ void RoutedZone::add_route_check_params(NetPoint* src, NetPoint* dst, NetPoint*
                dstName, gw_dst->get_cname());
   }
 
-  piface_.on_route_creation(symmetrical, src, dst, gw_src, gw_dst, link_list);
+  get_iface()->on_route_creation(symmetrical, src, dst, gw_src, gw_dst, link_list);
 }
 }
 }