Merge branch 'master' of git.mcs.anl.gov:radix/codes-net

codes/torus.h

@@ -122,8 +122,8 @@ tw_stime         max_latency = 0;
 float head_delay=0.0;
 float credit_delay = 0.0;
 
-static unsigned long long       N_finished_packets = 0;
-static unsigned long long       total_hops = 0;
+static long long       N_finished_packets = 0;
+static long long       total_hops = 0;
 // run time arguments
 int num_packets;
 int num_chunks;

src/models/networks/model-net/simplenet-upd.c

@@ -218,7 +218,7 @@ static void sn_init(
     sn_state * ns,
     tw_lp * lp)
 {
-    uint32_t h1, h2;
+    uint32_t h1 = 0, h2 = 0;
     memset(ns, 0, sizeof(*ns));
 
     /* all devices are idle to begin with */