From: Roland McGrath <roland@redhat.com>
Date: Sat, 4 Jul 2009 10:53:55 +0000 (-0700)
Subject: Fix dwarf_output::attributes_type definition.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=095c589572489081c24d3056fc4d632361f1417f;p=thirdparty%2Felfutils.git

Fix dwarf_output::attributes_type definition.
---

diff --git a/libdw/c++/dwarf_output b/libdw/c++/dwarf_output
index 402a85139..3ec3c4a2d 100644
--- a/libdw/c++/dwarf_output
+++ b/libdw/c++/dwarf_output
@@ -361,7 +361,8 @@ namespace elfutils
       friend class subr::create_container;
 
     public:
-      typedef dwarf_data::attributes_type<dwarf_output> attributes_type;
+      typedef dwarf_data::attributes_type<dwarf_output,
+					  value_wrapper> attributes_type;
 
       class children_type : public std::list<debug_info_entry>
       {
@@ -564,13 +565,6 @@ namespace elfutils
   std::string
   to_string<dwarf_output::attr_value> (const dwarf_output::attr_value&);
 
-  template<>
-  std::string
-  to_string<dwarf_data::attr_value<dwarf_output,
-				   dwarf_data::value<dwarf_output> > >
-  (const dwarf_data::attr_value<dwarf_output,
-				dwarf_data::value<dwarf_output> > &);
-
 #endif
 
   class dwarf_output_collector
diff --git a/libdw/c++/output-values.cc b/libdw/c++/output-values.cc
index ad383fd76..05e9b7404 100644
--- a/libdw/c++/output-values.cc
+++ b/libdw/c++/output-values.cc
@@ -57,9 +57,6 @@ using namespace elfutils;
 
 // Actually both the same thing!
 template dwarf::value_space dwarf_output::attr_value::what_space () const;
-template dwarf::value_space
-dwarf_data::attr_value<dwarf_output, dwarf_data::value<dwarf_output>
-		       >::what_space () const;
 
 template<>
 std::string
diff --git a/libdw/c++/values.cc b/libdw/c++/values.cc
index 93c4230e4..37e5122c0 100644
--- a/libdw/c++/values.cc
+++ b/libdw/c++/values.cc
@@ -256,13 +256,9 @@ to_string<dwarf_edit::attr_value> (const dwarf_edit::attr_value &value)
   return value_string (value);
 }
 
-// Really.
 template<>
 string
-to_string<dwarf_data::attr_value<dwarf_output,
-				 dwarf_data::value<dwarf_output> > >
-(const dwarf_data::attr_value<dwarf_output,
- 			      dwarf_data::value<dwarf_output> > &value)
+to_string<dwarf_output::attr_value> (const dwarf_output::attr_value &value)
 {
   return value_string (value);
 }