Fix static initialization order fiasco reported by fbinfer.

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

diff --git a/src/xbt/dynar.cpp b/src/xbt/dynar.cpp
index ae898abfee7d458146f05fe5556be12f1e102986..8fc42eafbd0a149a5bfa1cf78489858fa5e5fc25 100644 (file)
--- a/src/xbt/dynar.cpp
+++ b/src/xbt/dynar.cpp
@@ -1,6 +1,6 @@
 /* a generic DYNamic ARray implementation.                                  */
 
-/* Copyright (c) 2004-2020. The SimGrid Team.
+/* Copyright (c) 2004-2021. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -59,7 +59,7 @@ static inline void _xbt_dynar_expand(xbt_dynar_t dynar, unsigned long nb)
 
 static inline void* _xbt_dynar_elm(const_xbt_dynar_t dynar, unsigned long idx)
 {
-  char *const data = (char *) dynar->data;
+  auto* const data            = static_cast<char*>(dynar->data);
   const unsigned long elmsize = dynar->elmsize;
 
   return data + idx * elmsize;
@@ -387,7 +387,7 @@ void xbt_dynar_shift(xbt_dynar_t dynar, void* dst)
  */
 void xbt_dynar_map(const_xbt_dynar_t dynar, void_f_pvoid_t op)
 {
-  char *const data = (char *) dynar->data;
+  auto* const data            = static_cast<char*>(dynar->data);
   const unsigned long elmsize = dynar->elmsize;
   const unsigned long used = dynar->used;