Fixed some compilation issues (warnings) in last commits

diff --git a/src/simix/smx_private.h b/src/simix/smx_private.h
index 824239f..61acf3b 100644 (file)
--- a/src/simix/smx_private.h
+++ b/src/simix/smx_private.h
@@ -185,6 +185,8 @@ static XBT_INLINE e_smx_state_t SIMIX_action_map_state(e_surf_action_state_t sta
   }
 }
 
   }
 }
 

+int process_syscall_color(void *p);
+

 void SIMIX_context_mod_init(void);
 void SIMIX_context_mod_exit(void);
 
 void SIMIX_context_mod_init(void);
 void SIMIX_context_mod_exit(void);
 

diff --git a/src/xbt/dynar.c b/src/xbt/dynar.c
index 02f7414..7e7512b 100644 (file)
--- a/src/xbt/dynar.c
+++ b/src/xbt/dynar.c
@@ -751,16 +751,16 @@ XBT_PUBLIC(void) xbt_dynar_three_way_partition(xbt_dynar_t const dynar,
   } while(0)
 
   for (i = 0; i < q;) {
   } while(0)
 
   for (i = 0; i < q;) {

-    void *datai = data + i*elmsize;
-    int colori = color(datai);
+    unsigned long int datai = ((unsigned long int) data) + i*elmsize;
+    int colori = color((void *) datai);

 
     if(colori==0) {
 
     if(colori==0) {

-      void *datap = data + (++p)*elmsize;
-      swap(datai, datap);
+      unsigned long int datap = ((unsigned long int) data) + (++p)*elmsize;
+      swap((void *) datai, (void *) datap);

       ++i;
     } else if (colori==2) {
       ++i;
     } else if (colori==2) {

-      void *dataq = data + (--q)*elmsize;
-      swap(datai, dataq);
+      unsigned long int dataq = ((unsigned long int) data) + (--q)*elmsize;
+      swap((void *) datai, (void *) dataq);

     } else {
       ++i;
     }
     } else {
       ++i;
     }