From 1acf75ea136c6cf988628bb197fca7bb3f65dc39 Mon Sep 17 00:00:00 2001
From: paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 26 Sep 2006 00:59:37 +0000
Subject: [PATCH] 2006-09-26 Howard Hinnant <hhinnant@apple.com>
PR libstdc++/29224
* include/tr1/functional_iterate.h: Avoid -Wshadow warnings.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@117222 138bc75d-0d04-0410-961f-82ee72b054a4
---
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 410f39f7f292..839ad0a73045 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 0b039f944f6d..4a74f83efec9 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
--
GitLab