Index: src/processor/basic_code_modules.cc |
diff --git a/src/processor/basic_code_modules.cc b/src/processor/basic_code_modules.cc |
index 40b45a8bf8876f8317c7554050b2a3c2a8573328..88be402ae69ad87c83e4c54ceffce80c41653195 100644 |
--- a/src/processor/basic_code_modules.cc |
+++ b/src/processor/basic_code_modules.cc |
@@ -45,9 +45,7 @@ |
namespace google_breakpad { |
-BasicCodeModules::BasicCodeModules(const CodeModules *that) |
- : main_address_(0), |
- map_(new RangeMap<uint64_t, linked_ptr<const CodeModule> >()) { |
+BasicCodeModules::BasicCodeModules(const CodeModules *that) : main_address_(0) { |
Mark Mentovai
2016/06/02 21:43:53
Explicitly initialize map_ even if it’s just to _(
ivanpe
2016/06/02 22:54:02
Done.
|
BPLOG_IF(ERROR, !that) << "BasicCodeModules::BasicCodeModules requires " |
"|that|"; |
assert(that); |
@@ -66,30 +64,27 @@ BasicCodeModules::BasicCodeModules(const CodeModules *that) |
// GetModuleAtSequence. |
linked_ptr<const CodeModule> module( |
that->GetModuleAtIndex(module_sequence)->Copy()); |
- if (!map_->StoreRange(module->base_address(), module->size(), module)) { |
+ if (!map_.StoreRange(module->base_address(), 0 /* delta */, module->size(), |
+ module)) { |
BPLOG(ERROR) << "Module " << module->code_file() << |
" could not be stored"; |
} |
} |
} |
-BasicCodeModules::BasicCodeModules() |
- : main_address_(0), |
- map_(new RangeMap<uint64_t, linked_ptr<const CodeModule> >()) { |
-} |
+BasicCodeModules::BasicCodeModules() : main_address_(0) { } |
BasicCodeModules::~BasicCodeModules() { |
- delete map_; |
} |
unsigned int BasicCodeModules::module_count() const { |
- return map_->GetCount(); |
+ return map_.GetCount(); |
} |
const CodeModule* BasicCodeModules::GetModuleForAddress( |
uint64_t address) const { |
linked_ptr<const CodeModule> module; |
- if (!map_->RetrieveRange(address, &module, NULL, NULL)) { |
+ if (!map_.RetrieveRange(address, &module, NULL, NULL, NULL)) { |
BPLOG(INFO) << "No module at " << HexString(address); |
return NULL; |
} |
@@ -104,7 +99,7 @@ const CodeModule* BasicCodeModules::GetMainModule() const { |
const CodeModule* BasicCodeModules::GetModuleAtSequence( |
unsigned int sequence) const { |
linked_ptr<const CodeModule> module; |
- if (!map_->RetrieveRangeAtIndex(sequence, &module, NULL, NULL)) { |
+ if (!map_.RetrieveRangeAtIndex(sequence, &module, NULL, NULL, NULL)) { |
BPLOG(ERROR) << "RetrieveRangeAtIndex failed for sequence " << sequence; |
return NULL; |
} |