namespace simgrid {
namespace xbt {
-std::unique_ptr<char, void(*)(void*)> demangle(const char* name)
+std::unique_ptr<char, std::function<void(char*)>> demangle(const char* name)
{
#ifdef __GXX_ABI_VERSION
int status;
- auto res = std::unique_ptr<char, void (*)(void*)>(abi::__cxa_demangle(name, nullptr, nullptr, &status), &std::free);
+ std::unique_ptr<char, std::function<void(char*)>> res(abi::__cxa_demangle(name, nullptr, nullptr, &status),
+ &std::free);
if (res != nullptr)
return res;
// We did not manage to resolve this. Probably because this is not a mangled symbol:
#endif
// Return the symbol:
- return std::unique_ptr<char, void (*)(void*)>(xbt_strdup(name), &std::free);
+ return std::unique_ptr<char, std::function<void(char*)>>(xbt_strdup(name), &xbt_free_f);
}
class BacktraceImpl {
bool unref()
{
refcount_--;
- return refcount_ == 0;
+ if (refcount_ == 0) {
+ delete this;
+ return true;
+ } else {
+ return false;
+ }
}
#if HAVE_BOOST_STACKTRACE
boost::stacktrace::stacktrace st;
impl_->ref();
}
-Backtrace::~Backtrace()
+Backtrace::Backtrace(Backtrace&& bt)
+{
+ impl_ = bt.impl_;
+ bt.impl_ = nullptr;
+}
+
+Backtrace& Backtrace::operator=(const Backtrace& rhs)
{
- if (impl_ != nullptr && impl_->unref()) {
- delete impl_;
+ if (this != &rhs) {
+ if (impl_)
+ impl_->unref();
+ impl_ = rhs.impl_;
+ if (impl_)
+ impl_->ref();
}
+ return *this;
+}
+
+Backtrace& Backtrace::operator=(Backtrace&& rhs)
+{
+ if (this != &rhs) {
+ if (impl_)
+ impl_->unref();
+ impl_ = rhs.impl_;
+ rhs.impl_ = nullptr;
+ }
+ return *this;
+}
+
+Backtrace::~Backtrace()
+{
+ if (impl_)
+ impl_->unref();
}
std::string const Backtrace::resolve() const