From: Martin Quinson Date: Mon, 29 Oct 2018 20:01:15 +0000 (+0100) Subject: Fix build without stacktrace_backtrace X-Git-Tag: v3_22~827 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/80c366c83ae7b4fff1fc8d01d320e1f8faba9acc Fix build without stacktrace_backtrace --- diff --git a/include/xbt/backtrace.hpp b/include/xbt/backtrace.hpp index ff2e3f2e70..de3765e822 100644 --- a/include/xbt/backtrace.hpp +++ b/include/xbt/backtrace.hpp @@ -37,7 +37,7 @@ class BacktraceImpl; */ class Backtrace { public: - BacktraceImpl* impl_; + BacktraceImpl* impl_ = nullptr; Backtrace(); Backtrace(const Backtrace& bt); ~Backtrace(); diff --git a/src/xbt/backtrace.cpp b/src/xbt/backtrace.cpp index 743f0a4d4f..db93b541f1 100644 --- a/src/xbt/backtrace.cpp +++ b/src/xbt/backtrace.cpp @@ -33,11 +33,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_backtrace, xbt, "Backtrace"); -static bool startWith(std::string str, const char* prefix) -{ - return strncmp(str.c_str(), prefix, strlen(prefix)) == 0; -} - void xbt_backtrace_display(const simgrid::xbt::Backtrace& bt) { std::string backtrace = simgrid::xbt::resolve_backtrace(bt); @@ -100,7 +95,8 @@ Backtrace::Backtrace() Backtrace::Backtrace(const Backtrace& bt) { impl_ = bt.impl_; - impl_->ref(); + if (impl_) + impl_->ref(); } Backtrace::~Backtrace()