Merge branch 'master' into klement

[simgrid.git] / src / xbt / dynar.cpp

diff --git a/src/xbt/dynar.cpp b/src/xbt/dynar.cpp
index 31bbef2572365aee9730222cdc54c34850a66121..6778ca1f92fc1ff007c7e1624bd319d9151302a8 100644 (file)
--- a/src/xbt/dynar.cpp
+++ b/src/xbt/dynar.cpp
@@ -160,7 +160,7 @@ void xbt_dynar_free(xbt_dynar_t* dynar)
  */
 unsigned long xbt_dynar_length(const_xbt_dynar_t dynar)
 {
-  return (dynar ? (unsigned long) dynar->used : (unsigned long) 0);
+  return (dynar ? dynar->used : 0UL);
 }
 
 /**@brief check if a dynar is empty
@@ -399,7 +399,7 @@ void xbt_dynar_map(const_xbt_dynar_t dynar, void_f_pvoid_t op)
   _sanity_check_dynar(dynar);
 
   for (i = 0; i < used; i++) {
-    char* elm = (char*) data + i * elmsize;
+    char* elm = data + i * elmsize;
     op(elm);
   }
 }