X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5e3c88ee7fb6765d3a7e0b514dc5f550e9c1b996..a056732695cac7f3c0b79a127edfdf0023ccd537:/src/surf/AsCluster.hpp?ds=sidebyside

diff --git a/src/surf/AsCluster.hpp b/src/surf/AsCluster.hpp
index d48f955b02..3e0493b6f7 100644
--- a/src/surf/AsCluster.hpp
+++ b/src/surf/AsCluster.hpp
@@ -3,37 +3,37 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#ifndef SURF_ROUTING_CLUSTER_HPP_
-#define SURF_ROUTING_CLUSTER_HPP_
+#ifndef SIMGRID_ROUTING_CLUSTER_HPP_
+#define SIMGRID_ROUTING_CLUSTER_HPP_
 
 #include "src/surf/AsImpl.hpp"
 
 namespace simgrid {
-namespace surf {
+namespace routing {
 
 class XBT_PRIVATE AsCluster: public AsImpl {
 public:
-  AsCluster(const char*name);
-  ~AsCluster();
+  explicit AsCluster(const char*name);
+  ~AsCluster() override;
 
-  virtual void getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t into, double *latency) override;
+  void getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t into, double *latency) override;
   void getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges) override;
 
   virtual void create_links_for_node(sg_platf_cluster_cbarg_t cluster, int id, int rank, int position);
   virtual void parse_specific_arguments(sg_platf_cluster_cbarg_t cluster) {}
 
-  xbt_dynar_t privateLinks_ = xbt_dynar_new(sizeof(s_surf_parsing_link_up_down_t),NULL);
+  xbt_dynar_t privateLinks_ = xbt_dynar_new(sizeof(s_surf_parsing_link_up_down_t),nullptr);
 
   Link* backbone_ = nullptr;
   void *loopback_ = nullptr;
   NetCard *router_ = nullptr;
-  int has_limiter_ = 0;
-  int has_loopback_ = 0;
-  int nb_links_per_node_ = 1;
+  bool hasLimiter_  = false;
+  bool hasLoopback_ = false;
+  int linkCountPerNode_ = 1; /* may be 1 (if only a private link), 2 or 3 (if limiter and loopback) */
 
 };
 
 }
 }
 
-#endif /* SURF_ROUTING_CLUSTER_HPP_ */
+#endif /* SIMGRID_ROUTING_CLUSTER_HPP_ */