diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 0484e3403fa..63e54f7fe8d 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-26  Paolo Carlini  <pcarlini@suse.de>
+
+	* include/tr1/type_traits (__is_enum_helper): Slightly simplify,
+	make __convert non template.
+
 2004-12-26  Paolo Carlini  <pcarlini@suse.de>
 
 	* include/tr1/type_traits: Implement is_pod, has_trivial_constructor,
diff --git a/libstdc++-v3/include/tr1/type_traits b/libstdc++-v3/include/tr1/type_traits
index 0c53c9bb203..7b15b179e23 100644
--- a/libstdc++-v3/include/tr1/type_traits
+++ b/libstdc++-v3/include/tr1/type_traits
@@ -176,12 +176,11 @@ namespace tr1
       static __one __test(unsigned long long);
       static __two __test(...);
 
-      template<typename _Up>
-        struct __convert
-	{ operator _Up() const; };
+      struct __convert
+      { operator _Tp() const; };
 
     public:
-      static const bool __value = sizeof(__test(__convert<_Tp>())) == 1;
+      static const bool __value = sizeof(__test(__convert())) == 1;
     };
 
   template<typename _Tp>