re PR c++/36628 ([c++0x] incorrect decltype() handling of conditional operator)

2009-07-12  Paolo Carlini  <paolo.carlini@oracle.com>

	* include/std/type_traits (common_type): Remove workaround for
	PR36628, now fixed.

From-SVN: r149537

libstdc++-v3/ChangeLog

+2009-07-12  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* include/std/type_traits (common_type): Remove workaround for
+	PR36628, now fixed.
+
 2009-07-11  Richard Sandiford  <rdsandiford@googlemail.com>
 
 	PR testsuite/40699

libstdc++-v3/include/std/type_traits

@@ -580,13 +580,8 @@ namespace std
       static _Tp&& __t();
       static _Up&& __u();
 
-      // HACK: Prevents optimization of ?: in the decltype
-      // expression when the condition is the literal, "true".
-      // See, PR36628.
-      static bool __true_or_false();
-
     public:
-      typedef decltype(__true_or_false() ? __t() : __u()) type;
+      typedef decltype(true ? __t() : __u()) type;
     };
 
   template<typename _Tp, typename _Up, typename... _Vp>