cleanups: there is no random in the platforms since a while

[simgrid.git] / src / surf / surf_routing.hpp

diff --git a/src/surf/surf_routing.hpp b/src/surf/surf_routing.hpp
index e7242e8..0f398c5 100644 (file)
--- a/src/surf/surf_routing.hpp
+++ b/src/surf/surf_routing.hpp
@@ -36,7 +36,6 @@ class NetCard {
 public:
   virtual ~NetCard(){};
   virtual int id()=0; // Our rank in the vertices_ array of our containing AS.
-  virtual int *getIdPtr()=0;
   virtual void setId(int id)=0;
   virtual char *name()=0;
   virtual As *containingAS()=0; // This is the AS in which I am
@@ -113,12 +112,11 @@ public:
   {}
   ~NetCardImpl() { xbt_free(name_);};
 
-  int id() {return id_;}
-  int *getIdPtr() {return &id_;}
-  void setId(int id) {id_ = id;}
-  char *name() {return name_;}
-  As *containingAS() {return containingAS_;}
-  e_surf_network_element_type_t getRcType() {return componentType_;}
+  int id()           override {return id_;}
+  void setId(int id) override {id_ = id;}
+  char *name()       override {return name_;}
+  As *containingAS() override {return containingAS_;}
+  e_surf_network_element_type_t getRcType() override {return componentType_;}
 private:
   int id_ = -1;
   char *name_;
@@ -132,10 +130,10 @@ private:
 class Onelink {
 public:
   Onelink(void *link, NetCard *src, NetCard *dst)
-    : p_src(src), p_dst(dst), p_link(link) {};
-  NetCard *p_src;
-  NetCard *p_dst;
-  void *p_link;
+    : src_(src), dst_(dst), link_(link) {};
+  NetCard *src_;
+  NetCard *dst_;
+  void *link_;
 };
 
 /** @ingroup SURF_routing_interface
@@ -145,11 +143,10 @@ XBT_PUBLIC_CLASS RoutingPlatf {
 public:
   RoutingPlatf(void *loopback);
   ~RoutingPlatf();
-  As *p_root = nullptr;
-  void *p_loopback;
-  xbt_dynar_t p_lastRoute = xbt_dynar_new(sizeof(sg_routing_link_t),NULL);
+  As *root_ = nullptr;
+  void *loopback_;
+  xbt_dynar_t lastRoute_ = xbt_dynar_new(sizeof(Link*),NULL);
   xbt_dynar_t getOneLinkRoutes(void);
-  xbt_dynar_t recursiveGetOneLinkRoutes(As *rc);
   void getRouteAndLatency(NetCard *src, NetCard *dst, xbt_dynar_t * links, double *latency);
 };