cruft removal

2 files changed, 4 insertions, 30 deletions

diff --git a/libdw/c++/dwarf_output b/libdw/c++/dwarf_output
index 6c5fe519..65bff72f 100644
--- a/libdw/c++/dwarf_output
+++ b/libdw/c++/dwarf_output
@@ -295,35 +295,6 @@ namespace elfutils
     static inline const range_list &
     collect (dwarf_output_collector *, const typename input::range_list &);
 
-    template<typename input, typename output>
-    struct make_any
-      : public std::binary_function<typename input::value_type,
-				    dwarf_output_collector *,
-				    typename output::value_type>
-    {
-      inline typename output::value_type
-      operator () (const typename input::value_type &x,
-		   dwarf_output_collector *c)
-      {
-	return typename output::value_type (x, c);
-      }
-    };
-
-    template<typename input, typename output>
-    struct make_attribute
-      : public std::binary_function<typename input::value_type,
-				    dwarf_output_collector *,
-				    typename output::value_type>
-    {
-      inline typename output::value_type
-      operator () (const typename input::value_type &x,
-		   dwarf_output_collector *c)
-      {
-	return std::make_pair
-	  (x.first, typename output::value_type::second_type (x.second, c));
-      }
-    };
-
     /* An iterator adapter for use in iterator-based constructors.
        collectify (iterator) yields an iterator on input where *i
        constructs output::value_type (input::value_type v, collector).  */
diff --git a/tests/run-dwarfcmp-self.sh b/tests/run-dwarfcmp-self.sh
index 927083ed..6184ea7f 100755
--- a/tests/run-dwarfcmp-self.sh
+++ b/tests/run-dwarfcmp-self.sh
@@ -30,9 +30,12 @@ runtest()
 {
   for file; do
     if [ -f $file ]; then
-      { testrun ../src/dwarfcmp -q -i $file $file &&
+      {
+(set -x
+       testrun ../src/dwarfcmp -q -i $file $file &&
 	testrun ../src/dwarfcmp -i $file $file &&
 	testrun ../src/dwarfcmp -T -q -i $file $file
+) > dwarfcmp-${file//\//_}.out 2>&1
       } ||
       { echo "*** failure in $file"; status=1; }
     fi