Add dwarf::debug_info_entry::identity_type typedef, make it uintptr_t instead of...

diff --git a/libdw/c++/dwarf b/libdw/c++/dwarf
index ef2833b437d337132af78a1ff987fea1ff9d1644..56d58e2fc668933cc93e55133ee92ccdeedeaf49 100644 (file)
--- a/libdw/c++/dwarf
+++ b/libdw/c++/dwarf
@@ -497,7 +497,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 2ac1afb0be97de4408721a56381d4b965e4a769d..9457acfc7d9469a51caedfc11bf52f13ff361725 100644 (file)
--- a/libdw/c++/dwarf_edit
+++ b/libdw/c++/dwarf_edit
@@ -237,7 +237,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 2d05665d982899de76c4e5baf310f731de9d2da2..3ba2bfcaa522110d9f2ab3edff127ba96176c655 100644 (file)
--- a/libdw/c++/dwarf_output
+++ b/libdw/c++/dwarf_output
@@ -438,7 +438,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 1bceeca74ace1828d349d1fddfde6fc59850601a..cfb6c4a10ec77353568fd808bb31a22c67c44ac7 100644 (file)
--- 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 ff20d38005c689a530219b6a645e4dd823e331c4..ae4179f2023b2cd8835c8114ae389f0cacb1c2e8 100644 (file)
--- 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
@@ -355,8 +356,10 @@ namespace elfutils
     tracker2 _m_right;
 
     typedef std::tr1::unordered_map<
-      ::Dwarf_Off, std::pair<const die2 *,
-                            std::tr1::unordered_set< ::Dwarf_Off> >
+      dwarf::debug_info_entry::identity_type,
+      std::pair<const die2 *,
+               std::tr1::unordered_set<dwarf::debug_info_entry::identity_type>
+               >
       > equiv_map;
     equiv_map *_m_equiv;
     bool _m_delete_equiv;