diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/type_traits | 7 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index f9cac8c4272..97a165d7127 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +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 diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits index ce9ee1b06f8..94c40df97b8 100644 --- a/libstdc++-v3/include/std/type_traits +++ b/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> |