From dc04f83284126c46ca9f5fe5489c31fffd3eb89a Mon Sep 17 00:00:00 2001
From: Martin Quinson <martin.quinson@loria.fr>
Date: Wed, 13 Jan 2016 23:26:33 +0100
Subject: [PATCH 1/1] move some content from AsNone into As (AsNone should die)

---
 src/surf/surf_routing.hpp      | 19 +++++++++++--------
 src/surf/surf_routing_none.cpp |  6 ------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/surf/surf_routing.hpp b/src/surf/surf_routing.hpp
index 7fdd8601ac..600edf1e1e 100644
--- a/src/surf/surf_routing.hpp
+++ b/src/surf/surf_routing.hpp
@@ -48,15 +48,15 @@ public:
  */
 class As {
 public:
-  xbt_dynar_t p_indexNetworkElm;
+  xbt_dynar_t p_indexNetworkElm = xbt_dynar_new(sizeof(char*),NULL);
   xbt_dict_t p_bypassRoutes;    /* store bypass routes */
   routing_model_description_t p_modelDesc;
   e_surf_routing_hierarchy_t p_hierarchy;
-  char *p_name;
-  As *p_routingFather;
-  xbt_dict_t p_routingSons;
+  char *p_name = nullptr;
+  As *p_routingFather = nullptr;
+  xbt_dict_t p_routingSons = xbt_dict_new_homogeneous(NULL);
   NetCard *p_netElem;
-  xbt_dynar_t p_linkUpDownList;
+  xbt_dynar_t p_linkUpDownList = NULL;
 
   /**
    * @brief The As constructor
@@ -67,9 +67,12 @@ public:
    * @brief The As destructor
    */
   virtual ~As(){
-	xbt_free(p_name);
-	if (p_netElem)
-		delete p_netElem;
+    xbt_dict_free(&p_routingSons);
+    xbt_dynar_free(&p_indexNetworkElm);
+    xbt_dynar_free(&p_linkUpDownList);
+    xbt_free(p_name);
+    if (p_netElem)
+      delete p_netElem;
   };
 
   /**
diff --git a/src/surf/surf_routing_none.cpp b/src/surf/surf_routing_none.cpp
index 2ea5660cca..989730d783 100644
--- a/src/surf/surf_routing_none.cpp
+++ b/src/surf/surf_routing_none.cpp
@@ -63,15 +63,9 @@ void AsNone::parseBypassroute(sg_platf_route_cbarg_t /*e_route*/){
 
 /* Creation routing model functions */
 AsNone::AsNone() {
-  p_routingSons = xbt_dict_new_homogeneous(NULL);
-  p_indexNetworkElm = xbt_dynar_new(sizeof(char*),NULL);
-  p_linkUpDownList = NULL;
 }
 
 AsNone::~AsNone() {
-  xbt_dict_free(&p_routingSons);
-  xbt_dynar_free(&p_indexNetworkElm);
-  xbt_dynar_free(&p_linkUpDownList);
 }
 
 }
-- 
2.20.1