From: Roland McGrath <roland@redhat.com>
Date: Tue, 16 Jun 2009 05:09:50 +0000 (-0700)
Subject: Some compile nits for GCC 4.4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6b643a56310568208c2fbf0635df7b30a246b567;p=thirdparty%2Felfutils.git

Some compile nits for GCC 4.4
---

diff --git a/libdw/c++/dwarf b/libdw/c++/dwarf
index 45dc558f7..591d5e1dd 100644
--- a/libdw/c++/dwarf
+++ b/libdw/c++/dwarf
@@ -295,7 +295,7 @@ namespace elfutils
       raw _m_raw;
 
     protected:
-      inline skipping_wrapper (const raw &raw) : _m_raw (raw) {}
+      inline skipping_wrapper (const raw &r) : _m_raw (r) {}
 
     public:
       inline skipping_wrapper (const skipping_wrapper &w) : _m_raw (w._m_raw) {}
diff --git a/libdw/c++/dwarf_edit b/libdw/c++/dwarf_edit
index e2811bbd2..83051e5d6 100644
--- a/libdw/c++/dwarf_edit
+++ b/libdw/c++/dwarf_edit
@@ -139,8 +139,8 @@ namespace elfutils
 
       /* The template constructor lets us copy in from any class that has
 	 compatibly iterable containers for attributes and children.  */
-      template<typename die>
-      debug_info_entry (const die &die)
+      template<typename die_type>
+      debug_info_entry (const die_type &die)
 	: _m_tag (die.tag ()),
 	  _m_attributes (die.attributes ()),
 	  _m_children (die.children ())
@@ -197,8 +197,8 @@ namespace elfutils
 
       // XXX should be private
     public:
-      template<typename die>
-      compile_unit (const die &die) : debug_info_entry (die)
+      template<typename die_type>
+      compile_unit (const die_type &die) : debug_info_entry (die)
       {
 	if (die.tag () != ::DW_TAG_compile_unit)
 	  throw std::invalid_argument ("not a compile_unit entry");
diff --git a/libdw/libdwP.h b/libdw/libdwP.h
index d630cd376..09f29d1ef 100644
--- a/libdw/libdwP.h
+++ b/libdw/libdwP.h
@@ -426,6 +426,7 @@ extern int __libdw_visit_scopes (unsigned int depth,
 extern int __dwarf_errno_internal (void);
 
 
+#ifndef __cplusplus
 /* Reader hooks.  */
 
 /* Relocation hooks return -1 on error (in that case the error code
@@ -573,7 +574,7 @@ unsigned char * __libdw_formptr (Dwarf_Attribute *attr, int sec_index,
 				 int err_nodata, unsigned char **endpp,
 				 Dwarf_Off *offsetp)
   internal_function;
-
+#endif	/* Not C++ */
 
 
 /* Aliases to avoid PLTs.  */
diff --git a/tests/ChangeLog b/tests/ChangeLog
index 39245f84f..3c734f45b 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+2009-06-15  Roland McGrath  <roland@redhat.com>
+
+	* dwarf-print.cc: Include <cstdio>.
+
 2009-03-25  Petr Machata  <pmachata@redhat.com>
 
 	* dwarf-attributes.cc: New file.
diff --git a/tests/dwarf-print.cc b/tests/dwarf-print.cc
index 8aa12ca97..ef2536d8d 100644
--- a/tests/dwarf-print.cc
+++ b/tests/dwarf-print.cc
@@ -31,6 +31,7 @@
 #include <error.h>
 #include <fcntl.h>
 #include <clocale>
+#include <cstdio>
 #include <libintl.h>
 #include <ostream>
 #include <iomanip>