From 21c9e2b609f4030c1bae2550d2563dc81b48ed7d Mon Sep 17 00:00:00 2001
From: Howard Hinnant <hhinnant@apple.com>
Date: Tue, 26 Sep 2006 00:59:37 +0000
Subject: [PATCH] re PR libstdc++/29224 (-Wshadow causing warning in
 <tr1/functional>)

2006-09-26  Howard Hinnant  <hhinnant@apple.com>

	PR libstdc++/29224
	* include/tr1/functional_iterate.h: Avoid -Wshadow warnings.

From-SVN: r117222
---
 libstdc++-v3/ChangeLog                        |  5 +++++
 libstdc++-v3/include/tr1/functional_iterate.h | 10 +++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 410f39f7f29..839ad0a7304 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-26  Howard Hinnant  <hhinnant@apple.com>
+
+	PR libstdc++/29224
+	* include/tr1/functional_iterate.h: Avoid -Wshadow warnings.
+
 2006-09-25  Paolo Carlini  <pcarlini@suse.de>
 
 	PR libstdc++/29179
diff --git a/libstdc++-v3/include/tr1/functional_iterate.h b/libstdc++-v3/include/tr1/functional_iterate.h
index 0b039f944f6..4a74f83efec 100644
--- a/libstdc++-v3/include/tr1/functional_iterate.h
+++ b/libstdc++-v3/include/tr1/functional_iterate.h
@@ -1,6 +1,6 @@
 // TR1 functional -*- C++ -*-
 
-// Copyright (C) 2005 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 // Written by Douglas Gregor <doug.gregor -at- gmail.com>
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
@@ -195,7 +195,7 @@ template<typename _Res, typename _Class _GLIBCXX_COMMA_SHIFTED
   public:
     typedef _Res result_type;
 
-    explicit _Mem_fn(_Functor __pmf) : __pmf(__pmf) { }
+    explicit _Mem_fn(_Functor __pf) : __pmf(__pf) { }
 
     // Handle objects
     _Res
@@ -249,7 +249,7 @@ template<typename _Res, typename _Class _GLIBCXX_COMMA_SHIFTED
   public:
     typedef _Res result_type;
 
-    explicit _Mem_fn(_Functor __pmf) : __pmf(__pmf) { }
+    explicit _Mem_fn(_Functor __pf) : __pmf(__pf) { }
 
     // Handle objects
     _Res
@@ -303,7 +303,7 @@ template<typename _Res, typename _Class _GLIBCXX_COMMA_SHIFTED
   public:
     typedef _Res result_type;
 
-    explicit _Mem_fn(_Functor __pmf) : __pmf(__pmf) { }
+    explicit _Mem_fn(_Functor __pf) : __pmf(__pf) { }
 
     // Handle objects
     _Res
@@ -357,7 +357,7 @@ template<typename _Res, typename _Class _GLIBCXX_COMMA_SHIFTED
   public:
     typedef _Res result_type;
 
-    explicit _Mem_fn(_Functor __pmf) : __pmf(__pmf) { }
+    explicit _Mem_fn(_Functor __pf) : __pmf(__pf) { }
 
     // Handle objects
     _Res