Explicitly qualify specializations of elfutils::to_string

I attempted to build the "dwarflint" branch with gcc 7.3.1 , but ran
into various problems of the form:

c++/known.cc:220:1: error: explicit specialization of ‘template<class type> std::__cxx11::string elfutils::to_string(const type&)’ outside its namespace must use a nested-name-specifier [-fpermissive]
 to_string<dwarf::dwarf_enum> (const dwarf::dwarf_enum &value)
 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~

The fix appears to be trivial.

Signed-off-by: David Malcolm <dmalcolm@redhat.com>

diff --git a/libdw/ChangeLog b/libdw/ChangeLog
index e6e7f3bef6c747e7ac3697c7531cd260a64de8d7..9696d4d7cf85edae5c979cb5a704515b9d9f4e28 100644 (file)
--- a/libdw/ChangeLog
+++ b/libdw/ChangeLog
@@ -1,3 +1,16 @@
+2018-02-26  David Malcolm  <dmalcolm@redhat.com>
+
+       * c++/edit-values.cc (to_string<dwarf_edit::attribute>):
+       Explicitly qualify with "elfutils::".
+       * c++/known.cc (to_string<dwarf::dwarf_enum>): Likewise.
+       (to_string<dwarf_data::dwarf_enum>): Likewise.
+       * c++/output-values.cc (to_string<dwarf_output::attribute>):
+       Likewise.
+       * c++/values.cc (to_string<dwarf::attribute>): Likewise.
+       (to_string<dwarf::attr_value>): Likewise.
+       (to_string<dwarf_edit::attr_value>): Likewise.
+       (to_string<dwarf_output::attr_value>): Likewise.
+
 2017-10-03  Mark Wielaard  <mark@klomp.org>
 
        * libdw.h: Define LIBDW_CIE_ID and use it in dwarf_cfi_cie_p.

diff --git a/libdw/c++/edit-values.cc b/libdw/c++/edit-values.cc
index aefb5fd16438462c535458e8449c6cae662cb1a3..ca83a967ddc73d5a6acbfa94bb8dfac2e7517d34 100644 (file)
--- a/libdw/c++/edit-values.cc
+++ b/libdw/c++/edit-values.cc
@@ -41,7 +41,7 @@ template class dwarf_data::value<dwarf_edit>;
 
 template<>
 std::string
-to_string<dwarf_edit::attribute> (const dwarf_edit::attribute &attr)
+elfutils::to_string<dwarf_edit::attribute> (const dwarf_edit::attribute &attr)
 {
   return attribute_string (attr);
 }

diff --git a/libdw/c++/known.cc b/libdw/c++/known.cc
index bd84f52c829febd408b7362b1455e044307eb029..cb5fe693c1b2b205d1c0215ef6f1edcbff06fc3d 100644 (file)
--- a/libdw/c++/known.cc
+++ b/libdw/c++/known.cc
@@ -217,14 +217,14 @@ enum_string (const value_type &value)
 
 template<>
 string
-to_string<dwarf::dwarf_enum> (const dwarf::dwarf_enum &value)
+elfutils::to_string<dwarf::dwarf_enum> (const dwarf::dwarf_enum &value)
 {
   return enum_string (value);
 }
 
 template<>
 string
-to_string<dwarf_data::dwarf_enum> (const dwarf_data::dwarf_enum &value)
+elfutils::to_string<dwarf_data::dwarf_enum> (const dwarf_data::dwarf_enum &value)
 {
   return enum_string (value);
 }

diff --git a/libdw/c++/output-values.cc b/libdw/c++/output-values.cc
index 199c72bd33fef9a31003e418d8d64a0530294bb0..60abc0b5e705f803a137d57c8c354577a7458ccf 100644 (file)
--- a/libdw/c++/output-values.cc
+++ b/libdw/c++/output-values.cc
@@ -46,7 +46,7 @@ template class dwarf_output::copier<dwarf_edit>;
 
 template<>
 std::string
-to_string<dwarf_output::attribute> (const dwarf_output::attribute &attr)
+elfutils::to_string<dwarf_output::attribute> (const dwarf_output::attribute &attr)
 {
   return attribute_string (attr);
 }

diff --git a/libdw/c++/values.cc b/libdw/c++/values.cc
index 335074fb28315953719de34c93d1e141dfe3f94e..c70d793fa97a1edc124d6d84851d738aededfe12 100644 (file)
--- a/libdw/c++/values.cc
+++ b/libdw/c++/values.cc
@@ -227,28 +227,28 @@ value_string (const value_type &value)
 
 template<>
 string
-to_string<dwarf::attribute> (const dwarf::attribute &attr)
+elfutils::to_string<dwarf::attribute> (const dwarf::attribute &attr)
 {
   return attribute_string (attr);
 }
 
 template<>
 string
-to_string<dwarf::attr_value> (const dwarf::attr_value &value)
+elfutils::to_string<dwarf::attr_value> (const dwarf::attr_value &value)
 {
   return value_string (value);
 }
 
 template<>
 string
-to_string<dwarf_edit::attr_value> (const dwarf_edit::attr_value &value)
+elfutils::to_string<dwarf_edit::attr_value> (const dwarf_edit::attr_value &value)
 {
   return value_string (value);
 }
 
 template<>
 string
-to_string<dwarf_output::attr_value> (const dwarf_output::attr_value &value)
+elfutils::to_string<dwarf_output::attr_value> (const dwarf_output::attr_value &value)
 {
   return value_string (value);
 }