Keep deprecated wrappers "virtual".

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

diff --git a/include/xbt/backtrace.hpp b/include/xbt/backtrace.hpp
index ff2e3f2..27b9f8e 100644 (file)
--- a/include/xbt/backtrace.hpp
+++ b/include/xbt/backtrace.hpp
@@ -1,14 +1,15 @@
-/* Copyright (c) 2005-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2005-2019. 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. */
 
-#ifndef SIMGRIX_XBT_BACKTRACE_HPP
-#define SIMGRIX_XBT_BACKTRACE_HPP
+#ifndef SIMGRID_XBT_BACKTRACE_HPP
+#define SIMGRID_XBT_BACKTRACE_HPP
 
 #include <xbt/base.h>
 
 #include <cstddef>
+#include <functional>
 #include <memory>
 #include <string>
 #include <vector>
@@ -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
@@ -37,21 +38,19 @@ class BacktraceImpl;
  */
 class Backtrace {
 public:
-  BacktraceImpl* impl_;
+  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;
+  /** @brief Display the resolved backtrace on stderr */
+  void display() const;
 };
 
-/* Translate the backtrace in an human friendly form
- *
- *  Try resolve symbols and source code locations.
- */
-XBT_PUBLIC std::string resolve_backtrace(const Backtrace& bt);
 }
 }
-
-/** @brief Display a previously captured backtrace */
-XBT_PUBLIC void xbt_backtrace_display(const simgrid::xbt::Backtrace& bt);
-
 #endif