type_traits (__is_enum_helper): Slightly simplify, make __convert non template.

2004-12-26  Paolo Carlini  <pcarlini@suse.de>

	* include/tr1/type_traits (__is_enum_helper): Slightly simplify,
	make __convert non template.

From-SVN: r92622

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 0484e3403fa9f9e97fb78e6565ae862b7d09b3e1..63e54f7fe8d3d6c0a62a0cf6e18740b99b4416e1 100644 (file)
--- 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 0c53c9bb2032e2f74b84bc017c9534f05400f601..7b15b179e23cb599b063aeb985c5b719a38ea083 100644 (file)
--- 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>