diff options
| author | Roman Margold <rmargold@chromium.org> | 2017-02-01 16:26:39 -0800 |
|---|---|---|
| committer | Roman Margold <rmargold@chromium.org> | 2017-02-01 16:26:39 -0800 |
| commit | 24c359d32937bc99e3c818cce14939a2b31b6563 (patch) | |
| tree | ee80449b56b37400892627baf1414871e2db6948 /src/processor | |
| parent | Revert "iOS client identifies itself via URL params" (diff) | |
| download | breakpad-24c359d32937bc99e3c818cce14939a2b31b6563.tar.xz | |
Revert "Several fixes for broken Mac build"
This reverts commit 5c521532fc0a1b65f42c0d61d2da206eadf318b8.
Diffstat (limited to 'src/processor')
| -rw-r--r-- | src/processor/minidump.cc | 2 | ||||
| -rw-r--r-- | src/processor/stackwalker_mips.cc | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/processor/minidump.cc b/src/processor/minidump.cc index 439bb45f..c9fa4d81 100644 --- a/src/processor/minidump.cc +++ b/src/processor/minidump.cc @@ -3885,7 +3885,7 @@ const CodeModules* MinidumpUnloadedModuleList::Copy() const { return new BasicCodeModules(this); } -vector<linked_ptr<const CodeModule> > +vector<linked_ptr<const CodeModule>> MinidumpUnloadedModuleList::GetShrunkRangeModules() const { return vector<linked_ptr<const CodeModule> >(); } diff --git a/src/processor/stackwalker_mips.cc b/src/processor/stackwalker_mips.cc index 65b7c35a..db55d460 100644 --- a/src/processor/stackwalker_mips.cc +++ b/src/processor/stackwalker_mips.cc @@ -56,8 +56,8 @@ StackwalkerMIPS::StackwalkerMIPS(const SystemInfo* system_info, : Stackwalker(system_info, memory, modules, resolver_helper), context_(context) { if (context_->context_flags & MD_CONTEXT_MIPS64 ) { - if (memory_ && ((memory_->GetBase() + memory_->GetSize() - 1) - > 0xffffffffffffffff)) { + if ((memory_ && memory_->GetBase() + memory_->GetSize() - 1) + > 0xffffffffffffffff) { BPLOG(ERROR) << "Memory out of range for stackwalking mips64: " << HexString(memory_->GetBase()) << "+" @@ -65,7 +65,7 @@ StackwalkerMIPS::StackwalkerMIPS(const SystemInfo* system_info, memory_ = NULL; } } else { - if (memory_ && ((memory_->GetBase() + memory_->GetSize() - 1) > 0xffffffff)) { + if ((memory_ && memory_->GetBase() + memory_->GetSize() - 1) > 0xffffffff) { BPLOG(ERROR) << "Memory out of range for stackwalking mips32: " << HexString(memory_->GetBase()) << "+" |