X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/96cedde3cdbc0b8ffc3f096a1b65d021b0226f99..5fda94ac3d246037758dab959b3dfc9a071ccc26:/include/xbt/backtrace.hpp

diff --git a/include/xbt/backtrace.hpp b/include/xbt/backtrace.hpp
index 35dc7b7ecf..4a3a589044 100644
--- a/include/xbt/backtrace.hpp
+++ b/include/xbt/backtrace.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2005-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2005-2020. 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. */
@@ -8,15 +8,14 @@
 
 #include <xbt/base.h>
 
-#include <cstddef>
+#include <functional>
 #include <memory>
 #include <string>
-#include <vector>
 
-SG_BEGIN_DECL()
+SG_BEGIN_DECL
 /** @brief Shows a backtrace of the current location */
 XBT_PUBLIC void xbt_backtrace_display_current();
-SG_END_DECL()
+SG_END_DECL
 
 namespace simgrid {
 namespace xbt {
@@ -25,7 +24,7 @@ namespace xbt {
  *
  *  Return the origin string if this fails.
  */
-XBT_PUBLIC std::unique_ptr<char, void (*)(void*)> demangle(const char* name);
+XBT_PUBLIC std::unique_ptr<char, std::function<void(char*)>> demangle(const char* name);
 
 class BacktraceImpl;
 /** A backtrace
@@ -37,12 +36,10 @@ class BacktraceImpl;
  */
 class Backtrace {
 public:
-  BacktraceImpl* impl_ = nullptr;
+  std::shared_ptr<BacktraceImpl> impl_;
   Backtrace();
-  Backtrace(const Backtrace& bt);
-  ~Backtrace();
   /** @brief Translate the backtrace in a human friendly form, unmangled with source code locations. */
-  std::string const resolve() const;
+  std::string resolve() const;
   /** @brief Display the resolved backtrace on stderr */
   void display() const;
 };