Merge branch 'dwarf' into roland/dwarf_output-tracker

Conflicts:
	libdw/c++/dwarf_tracker

5 files changed, 11 insertions, 7 deletions

diff --git a/libdw/c++/dwarf b/libdw/c++/dwarf
index b94354bc..61d9f8da 100644
--- a/libdw/c++/dwarf
+++ b/libdw/c++/dwarf
@@ -504,7 +504,8 @@ namespace elfutils
 
       /* This is an identity pointer that only matches the very same
 	 DIE in the very same file (same opened Dwarf instance).  */
-      inline ::Dwarf_Off identity () const
+      typedef uintptr_t identity_type;
+      inline identity_type identity () const
       {
 	return (uintptr_t) _m_die.addr;
       }
diff --git a/libdw/c++/dwarf_edit b/libdw/c++/dwarf_edit
index 61a5b20b..59a55c2a 100644
--- a/libdw/c++/dwarf_edit
+++ b/libdw/c++/dwarf_edit
@@ -242,7 +242,7 @@ namespace elfutils
 	return !(*this == other);
       }
 
-      inline ::Dwarf_Off identity () const
+      inline dwarf::debug_info_entry::identity_type identity () const
       {
 	return (uintptr_t) this;
       }
diff --git a/libdw/c++/dwarf_output b/libdw/c++/dwarf_output
index 47e82736..38da08aa 100644
--- a/libdw/c++/dwarf_output
+++ b/libdw/c++/dwarf_output
@@ -450,7 +450,7 @@ namespace elfutils
 	return !(*this == other);
       }
 
-      inline ::Dwarf_Off identity () const
+      inline dwarf::debug_info_entry::identity_type identity () const
       {
 	return (uintptr_t) this;
       }
diff --git a/libdw/c++/dwarf_ref_maker b/libdw/c++/dwarf_ref_maker
index 1bceeca7..cfb6c4a1 100644
--- a/libdw/c++/dwarf_ref_maker
+++ b/libdw/c++/dwarf_ref_maker
@@ -130,7 +130,8 @@ namespace elfutils
       }
     };
 
-    std::tr1::unordered_map< ::Dwarf_Off, seen> _m_map;
+    std::tr1::unordered_map<dwarf::debug_info_entry::identity_type,
+			    seen> _m_map;
 
   public:
     inline dwarf_ref_maker ()
diff --git a/libdw/c++/dwarf_tracker b/libdw/c++/dwarf_tracker
index 9d3b9bba..cb895343 100644
--- a/libdw/c++/dwarf_tracker
+++ b/libdw/c++/dwarf_tracker
@@ -86,7 +86,8 @@ namespace elfutils
 
     /* We record every DIE we have seen here, mapping its .identity ()
        to the die_path of parent DIEs taken to reach it.  */
-    typedef std::tr1::unordered_map< ::Dwarf_Off, const die_path> die_map;
+    typedef std::tr1::unordered_map<dwarf::debug_info_entry::identity_type,
+				    const die_path> die_map;
     die_map *_m_seen;
     bool _m_delete_seen;
 
@@ -174,7 +175,7 @@ namespace elfutils
     // Random access to a DIE, find the path of the walk that gets there.
     inline const die_path &path_to (const die &a)
     {
-      ::Dwarf_Off id = a->identity ();
+      const dwarf::debug_info_entry::identity_type id = a->identity ();
       std::pair<typename die_map::iterator, bool> found
 	= _m_seen->insert (std::make_pair (id, bad_die_path ()));
       if (found.second
@@ -373,7 +374,8 @@ namespace elfutils
     typedef std::pair<const die2 *,
 		      std::tr1::unordered_set<die2, ref_hasher, same_ref>
 		      > equiv_list;
-    typedef std::tr1::unordered_map< ::Dwarf_Off, equiv_list> equiv_map;
+    typedef std::tr1::unordered_map<dwarf::debug_info_entry::identity_type,
+				    equiv_list> equiv_map;
     equiv_map *_m_equiv;
     bool _m_delete_equiv;