X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2d882c1ac3c6eb891f8eb26a84ec2d6890a67730..b6e0974be6616f62aa724f7ec7ad1cff1b421e1e:/src/surf/network.cpp

diff --git a/src/surf/network.cpp b/src/surf/network.cpp
index e8e886e3ee..eb77f12111 100644
--- a/src/surf/network.cpp
+++ b/src/surf/network.cpp
@@ -248,11 +248,9 @@ 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){
-  ActionLmmPtr comm;
+void NetworkCm02Model::initialize()
+{
+  ActionLmmPtr comm = NULL;
 
   char *optim = xbt_cfg_get_string(_sg_cfg_set, "network/optim");
   int select =
@@ -314,7 +312,7 @@ NetworkCm02LinkLmmPtr NetworkCm02Model::createResource(const char *name,
   return nw_link;
 }
 
-void NetworkCm02Model::updateActionsStateLazy(double now, double delta)
+void NetworkCm02Model::updateActionsStateLazy(double now, double /*delta*/)
 {
   NetworkCm02ActionLmmPtr action;
   while ((xbt_heap_size(p_actionHeap) > 0)
@@ -324,7 +322,7 @@ void NetworkCm02Model::updateActionsStateLazy(double now, double delta)
 #ifdef HAVE_TRACING
     if (TRACE_is_enabled()) {
       int n = lmm_get_number_of_cnst_from_var(p_maxminSystem, action->p_variable);
-      unsigned int i;
+      int i;
       for (i = 0; i < n; i++){
         lmm_constraint_t constraint = lmm_get_cnst_from_var(p_maxminSystem,
                                                             action->p_variable,
@@ -500,15 +498,15 @@ ActionPtr NetworkCm02Model::communicate(RoutingEdgePtr src, RoutingEdgePtr dst,
   return action;
 }
 
-double NetworkCm02Model::latencyFactor(double size) {
+double NetworkCm02Model::latencyFactor(double /*size*/) {
   return sg_latency_factor;
 }
 
-double NetworkCm02Model::bandwidthFactor(double size) {
+double NetworkCm02Model::bandwidthFactor(double /*size*/) {
   return sg_bandwidth_factor;
 }
 
-double NetworkCm02Model::bandwidthConstraint(double rate, double bound, double size) {
+double NetworkCm02Model::bandwidthConstraint(double rate, double /*bound*/, double /*size*/) {
   return rate;
 }