From 57fde64cc42ae863d1515f1d57bf4ffcea391a41 Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@redhat.com>
Date: Thu, 2 Jul 2009 06:19:16 -0700
Subject: [PATCH] Cosmetic.

---
 libdw/c++/dwarf_output |  2 +-
 libdw/c++/subr.hh      | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/libdw/c++/dwarf_output b/libdw/c++/dwarf_output
index e13a15f2a..c224d3623 100644
--- a/libdw/c++/dwarf_output
+++ b/libdw/c++/dwarf_output
@@ -296,7 +296,7 @@ namespace elfutils
        constructs output::value_type (input::value_type v, collector).  */
     template<typename input, typename output>
     static inline typename subr::argifier<input, output,
-					  dwarf_output_collector *>::wrapped
+					  dwarf_output_collector *>::result_type
     collectify (const typename input::const_iterator &in,
 		dwarf_output_collector *c)
     {
diff --git a/libdw/c++/subr.hh b/libdw/c++/subr.hh
index 7a799eeb8..d1b4c7062 100644
--- a/libdw/c++/subr.hh
+++ b/libdw/c++/subr.hh
@@ -610,7 +610,7 @@ namespace elfutils
     template<typename input, typename output, typename arg_type>
     struct argifier
       : public std::unary_function<typename input::const_iterator,
-				   typename output::iterator>
+				   typename output::iterator> // not really
     {
       typedef typename input::const_iterator inny;
       typedef typename output::iterator outty;
@@ -635,16 +635,16 @@ namespace elfutils
 	: _m_maker (c)
       {}
 
-      typedef subr::wrapped_input_iterator<input, maker> wrapped;
+      typedef subr::wrapped_input_iterator<input, maker> result_type;
 
-      inline wrapped operator () (const inny &i)
+      inline result_type operator () (const inny &i)
       {
-	return wrapped (i, _m_maker);
+	return result_type (i, _m_maker);
       }
     };
 
     template<typename input, typename output, typename arg_type>
-    static inline typename argifier<input, output, arg_type>::wrapped
+    static inline typename argifier<input, output, arg_type>::result_type
     argify (const typename input::const_iterator &in, const arg_type &arg)
     {
       return argifier<input, output, arg_type> (arg) (in);
@@ -680,16 +680,16 @@ namespace elfutils
 	: _m_maker (c)
       {}
 
-      typedef subr::wrapped_input_iterator<input, maker> wrapped;
+      typedef subr::wrapped_input_iterator<input, maker> const_iterator;
 
-      inline wrapped operator () (const inny &i)
+      inline const_iterator operator () (const inny &i)
       {
-	return wrapped (i, _m_maker);
+	return const_iterator (i, _m_maker);
       }
     };
 
     template<typename input, typename output, typename arg_type>
-    static inline typename argifier2nd<input, output, arg_type>::wrapped
+    static inline typename argifier2nd<input, output, arg_type>::const_iterator
     argify2nd (const typename input::const_iterator &in, const arg_type &arg)
     {
       return argifier2nd<input, output, arg_type> (arg) (in);
-- 
2.47.2