X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ad9464165cc6189aedbcb6c639a3d6e47579c704..a0d47b6eaf07218a602ed6606da925fbd3629909:/src/xbt/log.cpp

diff --git a/src/xbt/log.cpp b/src/xbt/log.cpp
index d546f82e8d..d21ea0e07b 100644
--- a/src/xbt/log.cpp
+++ b/src/xbt/log.cpp
@@ -113,8 +113,8 @@ static void log_cat_exit(xbt_log_category_t cat)
     cat->layout = nullptr;
   }
 
-  for (auto const* child = cat->firstChild; child != nullptr; child = child->nextSibling)
-    log_cat_exit(const_cast<xbt_log_category_t>(child));
+  for (auto* child = cat->firstChild; child != nullptr; child = child->nextSibling)
+    log_cat_exit(child);
   cat->firstChild = nullptr;
 }
 
@@ -235,7 +235,7 @@ int _xbt_log_cat_init(xbt_log_category_t category, e_xbt_log_priority_t priority
     return priority >= category->threshold;
 
   static std::recursive_mutex log_cat_init_mutex;
-  log_cat_init_mutex.lock();
+  const std::scoped_lock lock(log_cat_init_mutex);
 
   XBT_DEBUG("Initializing category '%s' (firstChild=%s, nextSibling=%s)", category->name,
          (category->firstChild ? category->firstChild->name : "none"),
@@ -279,7 +279,6 @@ int _xbt_log_cat_init(xbt_log_category_t category, e_xbt_log_priority_t priority
   }
 
   category->initialized = 1;
-  log_cat_init_mutex.unlock();
   return priority >= category->threshold;
 }