From: Paul Bédaride <paul.bedaride@gmail.com>
Date: Mon, 18 Nov 2013 09:30:31 +0000 (+0100)
Subject: Fix int overflow on 32 arch
X-Git-Tag: v3_11_beta~285
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/94f980dcb3d25cdf2f85dd9d811de906d2f49eb8

Fix int overflow on 32 arch
---

diff --git a/src/msg/msg_vm.c b/src/msg/msg_vm.c
index 2f773b2014..0bc20d94f7 100644
--- a/src/msg/msg_vm.c
+++ b/src/msg/msg_vm.c
@@ -877,7 +877,7 @@ static double send_stage1(msg_host_t vm, const char *src_pm_name, const char *ds
   char *mbox = get_mig_mbox_src_dst(vm_name, src_pm_name, dst_pm_name);
 
   // const long chunksize = 1024 * 1024 * 100;
-  const long chunksize = 1024L * 1024 * 100000;
+  const unsigned long chunksize = 1024u * 1024u * 100000;
   long remaining = ramsize;
   double computed_total = 0;
 
diff --git a/src/surf/network.cpp b/src/surf/network.cpp
index e8e886e3ee..972411261b 100644
--- a/src/surf/network.cpp
+++ b/src/surf/network.cpp
@@ -248,7 +248,7 @@ void surf_network_model_init_Vegas(void)
   xbt_cfg_setdefault_double(_sg_cfg_set, "network/weight_S", 8775);
 }
 
-NetworkCm02Model::NetworkCm02Model() : NetworkCm02Model("network"){
+NetworkCm02Model::NetworkCm02Model() : Model("network"){
 }
 
 NetworkCm02Model::NetworkCm02Model(string name) : Model(name){