Adding support for overlapping ranges to RangeMap.

src/processor/basic_code_modules.h

Index: src/processor/basic_code_modules.h
diff --git a/src/processor/basic_code_modules.h b/src/processor/basic_code_modules.h
index ace569b8a7ad8aa9bdba67703a52b9cbfcd4ce10..97579b4dfef20ff2e087ae107c6faf4ea1b0799a 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 <stddef.h>
+
 #include "google_breakpad/processor/code_modules.h"
+#include "processor/linked_ptr.h"
+#include "processor/range_map.h"
 
 namespace google_breakpad {
 
-template<typename T> class linked_ptr;
-template<typename AddressType, typename EntryType> 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<uint64_t, linked_ptr<const CodeModule> > *map_;
+  RangeMap<uint64_t, linked_ptr<const CodeModule> > map_;
 
  private:
   // Disallow copy constructor and assignment operator.