make some field private, to please sonar

Sonar rational is that protected fields are the sign of a logic that
spreads over all sub-classes. I tend to strongly agree with this point.

diff --git a/include/simgrid/s4u/As.hpp b/include/simgrid/s4u/As.hpp
index 6758f4e..a02359d 100644 (file)
--- a/include/simgrid/s4u/As.hpp
+++ b/include/simgrid/s4u/As.hpp
@@ -58,15 +58,16 @@ public:
   void addBypassRoute(sg_platf_route_cbarg_t e_route);
 
 protected:
   void addBypassRoute(sg_platf_route_cbarg_t e_route);
 
 protected:

-  As* father_          = nullptr;
-  char *name_ = nullptr;
-  xbt_dict_t children_ = xbt_dict_new_homogeneous(nullptr); // sub-ASes

   std::vector<kernel::routing::NetCard*> vertices_; // our content, as known to our graph routing algorithm (maps vertexId -> vertex)
 
   std::vector<kernel::routing::NetCard*> vertices_; // our content, as known to our graph routing algorithm (maps vertexId -> vertex)
 

-  std::map<std::pair<std::string, std::string>, std::vector<surf::Link*>*> bypassRoutes_; // srcName x dstName -> route
-

 private:
 private:

+  As* father_ = nullptr;
+  char* name_ = nullptr;
+

   bool sealed_ = false; // We cannot add more content when sealed
   bool sealed_ = false; // We cannot add more content when sealed

+
+  std::map<std::pair<std::string, std::string>, std::vector<surf::Link*>*> bypassRoutes_; // srcName x dstName -> route
+  xbt_dict_t children_ = xbt_dict_new_homogeneous(nullptr);                               // sub-ASes

 };
 
 }}; // Namespace simgrid::s4u
 };
 
 }}; // Namespace simgrid::s4u

diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp
index 65e6254..21d0d8c 100644 (file)
--- a/src/surf/sg_platf.cpp
+++ b/src/surf/sg_platf.cpp
@@ -851,7 +851,9 @@ simgrid::s4u::As * sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS)
     case A_surfxml_AS_routing_Vivaldi:
       new_as = new simgrid::kernel::routing::AsVivaldi(current_routing, AS->id);
       break;
     case A_surfxml_AS_routing_Vivaldi:
       new_as = new simgrid::kernel::routing::AsVivaldi(current_routing, AS->id);
       break;

-    default:                                  xbt_die("Not a valid model!");                        break;
+    default:
+      xbt_die("Not a valid model!");
+      break;

   }
 
   /* make a new routing component */
   }
 
   /* make a new routing component */