Merge branch 'master' of github.com:simgrid/simgrid

[simgrid.git] / include / xbt / log.hpp

diff --git a/include/xbt/log.hpp b/include/xbt/log.hpp
index 1c495025b8029593638e4090bbd81ae87160414a..4aaff8a26af85b60cd279c99c47febb9d647da83 100644 (file)
--- a/include/xbt/log.hpp
+++ b/include/xbt/log.hpp
@@ -3,8 +3,8 @@
 /* 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 <simgrid/Exception.hpp>
 #include <xbt/log.h>
-#include <xbt/exception.hpp>
 
 namespace simgrid {
 namespace xbt {
@@ -21,8 +21,7 @@ XBT_PUBLIC void log_exception(e_xbt_log_priority_t priority, const char* context
 XBT_PUBLIC void install_exception_handler();
 
 // deprecated
-XBT_ATTRIB_DEPRECATED_v323("xbt::log_exception()") XBT_PUBLIC
-    void logException(e_xbt_log_priority_t priority, const char* context, std::exception const& exception);
+XBT_ATTRIB_DEPRECATED_v323("xbt::log_exception()") XBT_PUBLIC void logException(e_xbt_log_priority_t priority, const char* context, std::exception const& exception);
 XBT_ATTRIB_DEPRECATED_v323("xbt::install_exception_handler()") XBT_PUBLIC void installExceptionHandler();
 }
 }