partial revert of e16e0233

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

diff --git a/include/xbt/backtrace.hpp b/include/xbt/backtrace.hpp
index 35dc7b7..ad83cea 100644 (file)
--- a/include/xbt/backtrace.hpp
+++ b/include/xbt/backtrace.hpp
@@ -9,14 +9,15 @@
 #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 +26,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
@@ -40,6 +41,9 @@ public:
   BacktraceImpl* impl_ = nullptr;
   Backtrace();
   Backtrace(const Backtrace& bt);
+  Backtrace(Backtrace&& bt);
+  Backtrace& operator=(const Backtrace& rhs);
+  Backtrace& operator=(Backtrace&& rhs);
   ~Backtrace();
   /** @brief Translate the backtrace in a human friendly form, unmangled with source code locations. */
   std::string const resolve() const;