From 240ed57ee1ac6a87b91526b8331717d494801826 Mon Sep 17 00:00:00 2001 From: Ivan Penkov Date: Sun, 5 Jun 2016 22:41:10 -0700 Subject: Adding support for overlapping ranges to RangeMap. When enabled, adding of a new range that overlaps with an existing one can be a successful operation. The range which ends at the higher address will be shrunk down by moving its start position to a higher address so that it does not overlap anymore. This change is required to fix http://crbug/611824. The actual fix will come in a separate CL. R=mmandlis@chromium.org Review URL: https://codereview.chromium.org/2029953003 . --- src/processor/basic_code_modules.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/processor/basic_code_modules.h') diff --git a/src/processor/basic_code_modules.h b/src/processor/basic_code_modules.h index ace569b8..97579b4d 100644 --- a/src/processor/basic_code_modules.h +++ b/src/processor/basic_code_modules.h @@ -41,13 +41,14 @@ #ifndef PROCESSOR_BASIC_CODE_MODULES_H__ #define PROCESSOR_BASIC_CODE_MODULES_H__ +#include + #include "google_breakpad/processor/code_modules.h" +#include "processor/linked_ptr.h" +#include "processor/range_map.h" namespace google_breakpad { -template class linked_ptr; -template class RangeMap; - class BasicCodeModules : public CodeModules { public: // Creates a new BasicCodeModules object given any existing CodeModules @@ -75,7 +76,7 @@ class BasicCodeModules : public CodeModules { // The map used to contain each CodeModule, keyed by each CodeModule's // address range. - RangeMap > *map_; + RangeMap > map_; private: // Disallow copy constructor and assignment operator. -- cgit v1.2.1