Adding support for overlapping ranges to RangeMap.

src/processor/basic_code_modules.h

 // Copyright (c) 2006, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
@@ skipping 23 matching lines @@
 // instantiated directly, only based on other objects that implement
 // the CodeModules interface.  It exists to provide a CodeModules
 // implementation a place to store information when the life of the original
 // object (such as a MinidumpModuleList) cannot be guaranteed.
 //
 // Author: Mark Mentovai
 
 #ifndef PROCESSOR_BASIC_CODE_MODULES_H__
 #define PROCESSOR_BASIC_CODE_MODULES_H__
 
+#include <cstddef>

[Mark Mentovai, 2016/06/02 21:43:53]

Use <stddef.h> unless you want to call it std::uint64_t, which you do not.

[ivanpe, 2016/06/02 22:54:02]

Done.

+
 #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
   // implementation.  This is useful to make a copy of the data relevant to
   // the CodeModules and CodeModule interfaces without requiring all of the
   // resources that other implementations may require.  A copy will be
   // made of each contained CodeModule using CodeModule::Copy.
   explicit BasicCodeModules(const CodeModules *that);
 
   virtual ~BasicCodeModules();
 
   // See code_modules.h for descriptions of these methods.
   virtual unsigned int module_count() const;
   virtual const CodeModule* GetModuleForAddress(uint64_t address) const;
   virtual const CodeModule* GetMainModule() const;
   virtual const CodeModule* GetModuleAtSequence(unsigned int sequence) const;
   virtual const CodeModule* GetModuleAtIndex(unsigned int index) const;
   virtual const CodeModules* Copy() const;
 
  protected:
   BasicCodeModules();
 
   // The base address of the main module.
   uint64_t main_address_;
 
   // 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_;

[Mark Mentovai, 2016/06/02 21:43:53]

I’m not sure we can guarantee C++11 in here. If not, leave the goofy spaced-out
> >.

[ivanpe, 2016/06/02 22:54:02]

Done.

 
  private:
   // Disallow copy constructor and assignment operator.
   BasicCodeModules(const BasicCodeModules &that);
   void operator=(const BasicCodeModules &that);
 };
 
 }  // namespace google_breakpad
 
 #endif  // PROCESSOR_BASIC_CODE_MODULES_H__