Fix dwarf_output::attributes_type definition.

diff --git a/libdw/c++/dwarf_output b/libdw/c++/dwarf_output
index 402a85139edc9220090ddf00e7f529f4f5591341..3ec3c4a2d7015d525e423766b9b4287dddb67fca 100644 (file)
--- 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 ad383fd7694d9dd89a63385b4b14f8c5193a5b0f..05e9b740407a3655afb17e6170a12d23f04b2250 100644 (file)
--- 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 93c4230e434b88ed73c406d473a1315ce92b9f8b..37e5122c0330841cc9028cb9b06ad9add52e6c5e 100644 (file)
--- 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);
 }