diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index ae3e7e4a013..62576893e25 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 e8be4459598..1a958c35391 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);
     }
 
   /**