Remove explicit conversion to std::string when it's not required.

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

diff --git a/src/xbt/log.cpp b/src/xbt/log.cpp
index bdb7d6f..d4e4fdd 100644 (file)
--- a/src/xbt/log.cpp
+++ b/src/xbt/log.cpp
@@ -5,7 +5,6 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "src/sthread/sthread.h" // sthread_inside_simgrid
 #include "src/xbt/log_private.hpp"
 #include "xbt/string.hpp"
 #include "xbt/sysdep.h"
@@ -247,8 +246,6 @@ int _xbt_log_cat_init(xbt_log_category_t category, e_xbt_log_priority_t priority
   if (category->initialized)
     return priority >= category->threshold;
 
-  int old_inside_simgrid = sthread_inside_simgrid;
-  sthread_inside_simgrid = 1;
   if (log_cat_init_mutex != nullptr)
     log_cat_init_mutex->lock();
 
@@ -296,7 +293,6 @@ int _xbt_log_cat_init(xbt_log_category_t category, e_xbt_log_priority_t priority
   category->initialized = 1;
   if (log_cat_init_mutex != nullptr)
     log_cat_init_mutex->unlock();
-  sthread_inside_simgrid = old_inside_simgrid;
   return priority >= category->threshold;
 }
 
@@ -415,7 +411,7 @@ static xbt_log_setting_t _xbt_log_parse_setting(const char *control_string)
       throw std::invalid_argument(simgrid::xbt::string_printf("Unknown appender log type: '%s'", value));
     }
   } else if (strncmp(option, "fmt", option_len) == 0) {
-    set.fmt = std::string(value);
+    set.fmt = value;
   } else {
     xbt_die("Unknown setting of the log category: '%.*s'", static_cast<int>(option_len), option);
   }