From 25687c41a4e7abbd8c68f56f7172d5830e8fea41 Mon Sep 17 00:00:00 2001
From: Arnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
Date: Tue, 19 Nov 2013 08:06:29 +0100
Subject: [PATCH] Delegated constructors are a c++11 feature, avoid them.

---
 src/surf/network.cpp |  6 ++----
 src/surf/network.hpp | 10 ++++++++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/surf/network.cpp b/src/surf/network.cpp
index e8e886e3ee..8fa588e5dc 100644
--- a/src/surf/network.cpp
+++ b/src/surf/network.cpp
@@ -248,10 +248,8 @@ void surf_network_model_init_Vegas(void)
   xbt_cfg_setdefault_double(_sg_cfg_set, "network/weight_S", 8775);
 }
 
-NetworkCm02Model::NetworkCm02Model() : NetworkCm02Model("network"){
-}
-
-NetworkCm02Model::NetworkCm02Model(string name) : Model(name){
+void NetworkCm02Model::initialize()
+{
   ActionLmmPtr comm;
 
   char *optim = xbt_cfg_get_string(_sg_cfg_set, "network/optim");
diff --git a/src/surf/network.hpp b/src/surf/network.hpp
index 97700992cd..62ae4e4416 100644
--- a/src/surf/network.hpp
+++ b/src/surf/network.hpp
@@ -35,13 +35,19 @@ void net_define_callbacks(void);
  * Model *
  *********/
 class NetworkCm02Model : public Model {
+private:
+  void initialize();
 public:
   NetworkCm02Model(int i) : Model("network") {
 	f_networkSolve = lmm_solve;
 	m_haveGap = false;
   };//FIXME: add network clean interface
-  NetworkCm02Model(string name);
-  NetworkCm02Model();
+  NetworkCm02Model(string name) : Model(name) {
+    this->initialize();
+  }
+  NetworkCm02Model() : Model("network") {
+    this->initialize();
+  }
   //FIXME:NetworkCm02LinkPtr createResource(string name);
   NetworkCm02LinkLmmPtr createResource(const char *name,
                                    double bw_initial,
-- 
2.20.1