aboutsummaryrefslogtreecommitdiff
path: root/libstdc++-v3
diff options
context:
space:
mode:
authorPaolo Carlini <paolo@gcc.gnu.org>2005-02-24 09:01:52 +0000
committerPaolo Carlini <paolo@gcc.gnu.org>2005-02-24 09:01:52 +0000
commitd962e37d43ae054bc723d1940f77118eeb168ac3 (patch)
tree891eabdd5e0c7b12854f58a2da7be9f31873113f /libstdc++-v3
parent7abd8a7e1f4e4197547583147f097c4e363cc562 (diff)
downloadgcc-d962e37d43ae054bc723d1940f77118eeb168ac3.zip
gcc-d962e37d43ae054bc723d1940f77118eeb168ac3.tar.gz
gcc-d962e37d43ae054bc723d1940f77118eeb168ac3.tar.bz2
functional (mem_fn): Avoid _T, badname on Darwin.
2005-02-24 Paolo Carlini <pcarlini@suse.de> * include/tr1/functional (mem_fn): Avoid _T, badname on Darwin. From-SVN: r95492
Diffstat (limited to 'libstdc++-v3')
-rw-r--r--libstdc++-v3/ChangeLog7
-rw-r--r--libstdc++-v3/include/tr1/functional8
2 files changed, 10 insertions, 5 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index ae3e7e4..6257689 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,4 +1,9 @@
-2005-02-23 Douglas Gregor <doug.gregor@gmail.com>
+2005-02-24 Paolo Carlini <pcarlini@suse.de>
+
+ * include/tr1/functional (mem_fn): Avoid _T, badname on
+ Darwin.
+
+2005-02-23 Douglas Gregor <doug.gregor@gmail.com>
* include/tr1/functional (function): New class template.
(mem_fn): New function template.
diff --git a/libstdc++-v3/include/tr1/functional b/libstdc++-v3/include/tr1/functional
index e8be445..1a958c3 100644
--- a/libstdc++-v3/include/tr1/functional
+++ b/libstdc++-v3/include/tr1/functional
@@ -191,11 +191,11 @@ namespace tr1
* @brief Returns a function object that forwards to the member
* pointer @a pm.
*/
- template<typename _T, typename _Class>
- inline _Mem_fn<_T _Class::*>
- mem_fn(_T _Class::* __pm)
+ template<typename _Tp, typename _Class>
+ inline _Mem_fn<_Tp _Class::*>
+ mem_fn(_Tp _Class::* __pm)
{
- return _Mem_fn<_T _Class::*>(__pm);
+ return _Mem_fn<_Tp _Class::*>(__pm);
}
/**