QuasarApp/backward-cpp
4
0
Fork 0
mirror of https://github.com/QuasarApp/backward-cpp.git synced 2025-05-03 21:39:35 +00:00
Code Issues Projects Releases Wiki Activity

Fix compilation on GCC with -Wzero-as-null-pointer-constant by using nullptr

Browse Source
This commit is contained in:
Arkadiusz Piekarz 2018-04-14 11:31:46 +02:00
parent f8b6d76dd2
commit 9e58734de9
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
backward.hpp
View File

@ -335,6 +335,7 @@ extern "C" uintptr_t _Unwind_GetIPInfo(_Unwind_Context*, int*);
} // namespace details } // namespace details
} // namespace backward } // namespace backward
#else // NOT BACKWARD_ATLEAST_CXX11 #else // NOT BACKWARD_ATLEAST_CXX11
# define nullptr NULL
# define override # define override
# include <map> # include <map>
namespace backward { namespace backward {
@ -472,7 +473,7 @@ public:
} }
operator const dummy*() const { operator const dummy*() const {
if (_empty) { if (_empty) {
return 0; return nullptr;
} }
return reinterpret_cast<const dummy*>(_val); return reinterpret_cast<const dummy*>(_val);
} }
@ -523,7 +524,7 @@ struct demangler_impl<system_tag::current_tag> {
std::string demangle(const char* funcname) { std::string demangle(const char* funcname) {
using namespace details; using namespace details;
char* result = abi::__cxa_demangle(funcname, char* result = abi::__cxa_demangle(funcname,
_demangle_buffer.release(), &_demangle_buffer_length, 0); _demangle_buffer.release(), &_demangle_buffer_length, nullptr);
if(result) { if(result) {
_demangle_buffer.reset(result); _demangle_buffer.reset(result);
return result; return result;
@ -550,7 +551,7 @@ struct Trace {
size_t idx; size_t idx;
Trace(): Trace():
addr(0), idx(0) {} addr(nullptr), idx(0) {}
explicit Trace(void* _addr, size_t _idx): explicit Trace(void* _addr, size_t _idx):
addr(_addr), idx(_idx) {} addr(_addr), idx(_idx) {}
@ -671,7 +672,7 @@ public:
if (size()) { if (size()) {
return &_stacktrace[skip_n_firsts()]; return &_stacktrace[skip_n_firsts()];
} }
return 0; return nullptr;
} }
protected: protected:
@ -3259,7 +3260,7 @@ public:
} }
#ifdef BACKWARD_ATLEAST_CXX11 #ifdef BACKWARD_ATLEAST_CXX11
SourceFile(SourceFile&& from): _file(0) { SourceFile(SourceFile&& from): _file(nullptr) {
swap(from); swap(from);
} }
SourceFile& operator=(SourceFile&& from) { SourceFile& operator=(SourceFile&& from) {
@ -3616,7 +3617,7 @@ private:
void print_source_loc(std::ostream& os, const char* indent, void print_source_loc(std::ostream& os, const char* indent,
const ResolvedTrace::SourceLoc& source_loc, const ResolvedTrace::SourceLoc& source_loc,
void* addr=0) { void* addr=nullptr) {
os << indent os << indent
<< "Source \"" << "Source \""
<< source_loc.filename << source_loc.filename
@ -3625,7 +3626,7 @@ private:
<< ", in " << ", in "
<< source_loc.function; << source_loc.function;
if (address && addr != 0) { if (address && addr != nullptr) {
os << " [" << addr << "]"; os << " [" << addr << "]";
} }
os << "\n"; os << "\n";
@ -3671,7 +3672,7 @@ public:
ss.ss_sp = _stack_content.get(); ss.ss_sp = _stack_content.get();
ss.ss_size = stack_size; ss.ss_size = stack_size;
ss.ss_flags = 0; ss.ss_flags = 0;
if (sigaltstack(&ss, 0) < 0) { if (sigaltstack(&ss, nullptr) < 0) {
success = false; success = false;
} }
} else { } else {
@ -3687,7 +3688,7 @@ public:
sigdelset(&action.sa_mask, posix_signals[i]); sigdelset(&action.sa_mask, posix_signals[i]);
action.sa_sigaction = &sig_handler; action.sa_sigaction = &sig_handler;
int r = sigaction(posix_signals[i], &action, 0); int r = sigaction(posix_signals[i], &action, nullptr);
if (r < 0) success = false; if (r < 0) success = false;
} }
@ -3700,7 +3701,7 @@ public:
ucontext_t *uctx = static_cast<ucontext_t*>(_ctx); ucontext_t *uctx = static_cast<ucontext_t*>(_ctx);
StackTrace st; StackTrace st;
void* error_addr = 0; void* error_addr = nullptr;
#ifdef REG_RIP // x86_64 #ifdef REG_RIP // x86_64
error_addr = reinterpret_cast<void*>(uctx->uc_mcontext.gregs[REG_RIP]); error_addr = reinterpret_cast<void*>(uctx->uc_mcontext.gregs[REG_RIP]);
#elif defined(REG_EIP) // x86_32 #elif defined(REG_EIP) // x86_32
@ -3731,7 +3732,7 @@ public:
printer.print(st, stderr); printer.print(st, stderr);
#if _XOPEN_SOURCE >= 700 || _POSIX_C_SOURCE >= 200809L #if _XOPEN_SOURCE >= 700 || _POSIX_C_SOURCE >= 200809L
psiginfo(info, 0); psiginfo(info, nullptr);
#else #else
(void)info; (void)info;
#endif #endif