X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/96cedde3cdbc0b8ffc3f096a1b65d021b0226f99..cc4eceb15c80a597e44222b8c0ff60caf85db959:/src/xbt/backtrace.cpp diff --git a/src/xbt/backtrace.cpp b/src/xbt/backtrace.cpp index 2be0a6c165..b9f4009f05 100644 --- a/src/xbt/backtrace.cpp +++ b/src/xbt/backtrace.cpp @@ -46,16 +46,13 @@ std::unique_ptr demangle(const char* name) { #ifdef __GXX_ABI_VERSION int status; - auto res = std::unique_ptr( - abi::__cxa_demangle(name, nullptr, nullptr, &status), - std::free - ); + auto res = std::unique_ptr(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(xbt_strdup(name), std::free); + return std::unique_ptr(xbt_strdup(name), &std::free); } class BacktraceImpl { @@ -87,6 +84,27 @@ Backtrace::Backtrace(const Backtrace& bt) impl_->ref(); } +Backtrace::Backtrace(Backtrace&& bt) +{ + impl_ = bt.impl_; + bt.impl_ = nullptr; +} + +Backtrace& Backtrace::operator=(const Backtrace& rhs) +{ + impl_ = rhs.impl_; + if (impl_) + impl_->ref(); + return *this; +} + +Backtrace& Backtrace::operator=(Backtrace&& rhs) +{ + impl_ = rhs.impl_; + rhs.impl_ = nullptr; + return *this; +} + Backtrace::~Backtrace() { if (impl_ != nullptr && impl_->unref()) {