Delegated constructors are a c++11 feature, avoid them.

diff --git a/src/surf/network.cpp b/src/surf/network.cpp
index e8e886e..8fa588e 100644 (file)
--- 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);
 }
 
   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");
   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 9770099..62ae4e4 100644 (file)
--- a/src/surf/network.hpp
+++ b/src/surf/network.hpp
@@ -35,13 +35,19 @@ void net_define_callbacks(void);
  * Model *
  *********/
 class NetworkCm02Model : public Model {
  * 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
 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,
   //FIXME:NetworkCm02LinkPtr createResource(string name);
   NetworkCm02LinkLmmPtr createResource(const char *name,
                                    double bw_initial,