Merge pull request #302 from mpoquet/rename-s4u-synchro-examples

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

diff --git a/include/xbt/log.hpp b/include/xbt/log.hpp
index 6dbf711..4aaff8a 100644 (file)
--- a/include/xbt/log.hpp
+++ b/include/xbt/log.hpp
@@ -1,10 +1,10 @@
-/* Copyright (c) 2016. The SimGrid Team. All rights reserved.*/
+/* Copyright (c) 2016-2018. The SimGrid Team. All rights reserved.          */
 
 /* 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 {
@@ -16,11 +16,12 @@ namespace xbt {
  *
  *  @ingroup XBT_ex
  */
-XBT_PUBLIC(void) logException(
-  e_xbt_log_priority_t priority,
-  const char* context, std::exception const& exception);
+XBT_PUBLIC void log_exception(e_xbt_log_priority_t priority, const char* context, std::exception const& exception);
 
-XBT_PUBLIC(void) installExceptionHandler();
+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::install_exception_handler()") XBT_PUBLIC void installExceptionHandler();
 }
 }