From: Roland McGrath <roland@redhat.com>
Date: Mon, 6 Jul 2009 08:12:48 +0000 (-0700)
Subject: Must keep identifier and string distinct.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3771c1e439562d670e3ae06911008e80059ec66b;p=thirdparty%2Felfutils.git

Must keep identifier and string distinct.
---

diff --git a/libdw/c++/dwarf_data b/libdw/c++/dwarf_data
index 12bae8fdd..cb412d302 100644
--- a/libdw/c++/dwarf_data
+++ b/libdw/c++/dwarf_data
@@ -794,6 +794,8 @@ namespace elfutils
 
       struct value_identifier : public value_string
       {
+	inline value_identifier () {}
+
 	template<typename id, typename arg_type>
 	inline value_identifier (const id &s, arg_type &arg)
 	  : value_string (s, arg)
@@ -1155,12 +1157,14 @@ namespace elfutils
 
       inline const std::string &identifier () const
       {
-	return string ();
+	return static_cast<const std::string &>
+	  (variant<typename vw::value_identifier> ());
       }
 
       inline std::string &identifier ()
       {
-	return string ();
+	return static_cast<std::string &>
+	  (variant<typename vw::value_identifier> ());
       }
 
       inline const typename impl::source_file &source_file () const