summaryrefslogtreecommitdiff
path: root/libstdc++-v3/include/tr1
diff options
context:
space:
mode:
authorHoward Hinnant <hhinnant@apple.com>2006-09-26 00:59:37 +0000
committerPaolo Carlini <paolo@gcc.gnu.org>2006-09-26 00:59:37 +0000
commit21c9e2b609f4030c1bae2550d2563dc81b48ed7d (patch)
tree376513a7bee9970f6e6e919367106c636d537d40 /libstdc++-v3/include/tr1
parent79c0cc65b3b96153d3b9670c08a4572d18a07c31 (diff)
downloadgcc-21c9e2b609f4030c1bae2550d2563dc81b48ed7d.tar.gz
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
Diffstat (limited to 'libstdc++-v3/include/tr1')
-rw-r--r--libstdc++-v3/include/tr1/functional_iterate.h10
1 files changed, 5 insertions, 5 deletions
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