2005-02-24 Paolo Carlini <pcarlini@suse.de>

	* include/tr1/functional (mem_fn): Avoid _T, badname on
	Darwin.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@95492 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index ae3e7e4a01377487deb38b34f567e46afddb6711..62576893e25f318d5e8bb954f1d66f0459a3db6e 100644 (file)
--- 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 e8be4459598ff8757e4fd02697598957c9f6fbe7..1a958c353916683766449dbd711d368869595ea4 100644 (file)
--- 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);
     }
 
   /**