From 8a1e07405cda12a7f8035f9679c7fc86f8cdd777 Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@redhat.com>
Date: Sat, 4 Jul 2009 01:17:54 -0700
Subject: [PATCH] Make dwarf_output start to compile again.

---
 libdw/c++/dwarf_output | 16 ++++++++--------
 tests/print-die.hh     |  7 ++++---
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/libdw/c++/dwarf_output b/libdw/c++/dwarf_output
index c9f1bf809..d8c7b9c56 100644
--- a/libdw/c++/dwarf_output
+++ b/libdw/c++/dwarf_output
@@ -331,14 +331,14 @@ namespace elfutils
 
       template<typename flavor, typename input>
       static inline value_dispatch *
-      make (flavor *&result, const input &x, const dwarf_data::nothing &)
+      make (flavor *&, const input &, const dwarf_data::nothing &)
       {
 	throw std::logic_error ("dwarf_output cannot be default-constructed");
       }
 
       template<typename flavor, typename input, typename arg_type>
       static inline value_dispatch *
-      make (flavor *&result, const input &x, const arg_type &arg)
+      make (flavor *&result, const input &x, arg_type &arg)
       {
 	return result = new flavor (x, arg);
       }
@@ -536,14 +536,12 @@ namespace elfutils
 
   public:
     // Constructor for an empty file, can add to its compile_units ().
-    dwarf_output ()
-      : _m_units ()
-    {}
+    inline dwarf_output () {}
 
     // Constructor copying CUs from an input file (can be any of dwarf,
     // dwarf_edit, or dwarf_output).
     template<typename input>
-    dwarf_output (const input &dw, dwarf_output_collector &c)
+    inline dwarf_output (const input &dw, dwarf_output_collector &c)
       : _m_units (dw.compile_units (), c)
     {}
 
@@ -578,10 +576,12 @@ namespace elfutils
   public:
 
     template<typename die1, typename die2> // XXX
-    inline void equivalence (const die1 &a, const die2 &b) {}
+    inline void equivalence (const die1 &, const die2 &)
+    {}
 
     template<typename die1, typename die2> // XXX
-    inline void refer (die1 *ref, const die2 &b) {}
+    inline void refer (die1 *, const die2 &)
+    {}
   };
 
   template<typename input>
diff --git a/tests/print-die.hh b/tests/print-die.hh
index 2934c0e78..7b4fa3f54 100644
--- a/tests/print-die.hh
+++ b/tests/print-die.hh
@@ -252,11 +252,12 @@ print_file (const char *name, const file &dw, const unsigned int limit)
     case copy_edit:
       print_file (dwarf_edit (dw), limit);
       break;
-#if 0 // XXX
     case copy_output:
-      print_file (dwarf_output (dw), limit);
+      {
+	dwarf_output_collector c; // We'll just throw it away.
+	print_file (dwarf_output (dw, c), limit);
+      }
       break;
-#endif
     default:
       abort ();
     }
-- 
2.47.2