Remove the -Wformat-security warning

Applying the patch from @agiersch

diff --git a/include/simgrid/Exception.hpp b/include/simgrid/Exception.hpp
index a8520fc..342bd4b 100644 (file)
--- a/include/simgrid/Exception.hpp
+++ b/include/simgrid/Exception.hpp
@@ -154,14 +154,7 @@ DECLARE_SIMGRID_EXCEPTION(ParseError, PARSE_ERROR_CONSTRUCTOR);
 #undef PARSE_ERROR_CONSTRUCTOR
 
 /** Exception raised by xbt_enforce, when an assertion is not satisfied */
-#define ASSERTION_ERROR_CONSTRUCTOR                                                                                    \
-  template<typename... Args> AssertionError(const char * f, Args... args)                                              \
-      : Exception(XBT_THROW_POINT, xbt::string_printf(f, args...))    \
-  {                                                                                                                    \
-  }
-
-DECLARE_SIMGRID_EXCEPTION(AssertionError, ASSERTION_ERROR_CONSTRUCTOR);
-#undef ASSERTION_ERROR_CONSTRUCTOR
+DECLARE_SIMGRID_EXCEPTION(AssertionError);
 
 #undef DECLARE_SIMGRID_EXCEPTION
 

diff --git a/include/xbt/asserts.hpp b/include/xbt/asserts.hpp
index d018d04..84f647a 100644 (file)
--- a/include/xbt/asserts.hpp
+++ b/include/xbt/asserts.hpp
@@ -28,7 +28,7 @@
 #define _xbt_enforce_ARGN(cond, ...)                                                                                   \
   do {                                                                                                                 \
     if (!(cond)) {                                                                                                     \
-      throw simgrid::AssertionError(__VA_ARGS__);                                                                 \
+      throw simgrid::AssertionError(XBT_THROW_POINT, xbt::string_printf(__VA_ARGS__));                                 \
     }                                                                                                                  \
   } while (0)