Picky gcc.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7418 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/src/simix/smx_network.c b/src/simix/smx_network.c
index b1608ca..0e1e66f 100644 (file)
--- a/src/simix/smx_network.c
+++ b/src/simix/smx_network.c
@@ -389,7 +389,7 @@ void SIMIX_message_sizes_output(const char *filename) {
   uintptr_t key,data;
   xbt_dict_cursor_t cursor;
   xbt_dict_foreach(msg_sizes,cursor,key,data) {
-    fprintf(out,"%d %d\n",key,data);
+    fprintf(out,"%ld %ld\n",key,data);
   }
   fclose(out);
 }

diff --git a/src/xbt/dict.c b/src/xbt/dict.c
index 09a8f57..602ef21 100644 (file)
--- a/src/xbt/dict.c
+++ b/src/xbt/dict.c
@@ -510,7 +510,7 @@ XBT_INLINE void xbt_dicti_set(xbt_dict_t dict,
   xbt_dictelm_t current, previous = NULL;
   xbt_assert(dict);
 
-  DEBUG5("ADD %d->%d; hash = %d, size = %d, & = %d", key, data, hash_code,
+  DEBUG5("ADD %ld->%ld; hash = %d, size = %d, & = %d", key, data, hash_code,
          dict->table_size, hash_code & dict->table_size);
   current = dict->table[hash_code & dict->table_size];
   while (current != NULL &&
@@ -587,7 +587,7 @@ XBT_INLINE void xbt_dicti_remove(xbt_dict_t dict, uintptr_t key) {
   }
 
   if (current == NULL)
-    THROW1(not_found_error, 0, "key %d not found", key);
+    THROW1(not_found_error, 0, "key %ld not found", key);
 
   if (previous != NULL) {
     previous->next = current->next;
@@ -1150,7 +1150,7 @@ XBT_TEST_UNIT("nulldata", test_dict_nulldata, "NULL data management")
 }
 
 static void debuged_addi(xbt_dict_t head, uintptr_t key, uintptr_t data) {
-  xbt_test_log2("Add %d under %d", data, key);
+  xbt_test_log2("Add %ld under %ld", data, key);
 
   xbt_dicti_set(head, key, data);
   if (XBT_LOG_ISENABLED(xbt_dict, xbt_log_priority_debug)) {
@@ -1159,7 +1159,7 @@ static void debuged_addi(xbt_dict_t head, uintptr_t key, uintptr_t data) {
   }
   uintptr_t stored_data = xbt_dicti_get(head, key);
   xbt_test_assert3(stored_data==data,
-      "Retrieved data (%d) is not what I just stored (%d) under key %d",stored_data,data,key);
+      "Retrieved data (%ld) is not what I just stored (%ld) under key %ld",stored_data,data,key);
 }
 
 XBT_TEST_UNIT("dicti", test_dict_scalar, "Scalar data and key management")