diff options
-rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
-rw-r--r-- | libstdc++-v3/testsuite/20_util/common_type/requirements/sfinae_friendly_1.cc | 11 |
2 files changed, 10 insertions, 6 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 89b86eb..b215f00 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2014-10-15 Daniel Krugler <daniel.kruegler@gmail.com> + + * testsuite/20_util/common_type/requirements/sfinae_friendly_1.cc: + Enable tests predicated on PR c++/53000. + 2014-10-15 François Dumont <fdumont@gcc.gnu.org> Jonathan Wakely <jwakely@redhat.com> diff --git a/libstdc++-v3/testsuite/20_util/common_type/requirements/sfinae_friendly_1.cc b/libstdc++-v3/testsuite/20_util/common_type/requirements/sfinae_friendly_1.cc index 3a4251c..7f83b8c 100644 --- a/libstdc++-v3/testsuite/20_util/common_type/requirements/sfinae_friendly_1.cc +++ b/libstdc++-v3/testsuite/20_util/common_type/requirements/sfinae_friendly_1.cc @@ -21,9 +21,6 @@ #include <type_traits> #include <initializer_list> -//TODO: Uncomment this once gcc bug 53000 has been resolved: -//#define HAS_53000_FIXED - // Helper types: struct has_type_impl { @@ -246,15 +243,17 @@ static_assert(is_type<std::common_type<UConv1, const Abstract*&>, static_assert(is_type<std::common_type<UConv1, UConv2>, Abstract*>(), ""); static_assert(is_type<std::common_type<UConv1&, UConv2&>, Abstract*>(), ""); -#ifdef HAS_53000_FIXED static_assert(is_type<std::common_type<Abstract&&, Abstract&&>, Abstract>(), ""); static_assert(is_type<std::common_type<const Abstract&&, + const Abstract&&>, Abstract>(), ""); +static_assert(is_type<std::common_type<volatile Abstract&&, volatile Abstract&&>, Abstract>(), ""); static_assert(is_type<std::common_type<Ukn&&, Ukn&&>, Ukn>(), ""); -static_assert(is_type<std::common_type<const Ukn&&, volatile Ukn&&>, +static_assert(is_type<std::common_type<const Ukn&&, const Ukn&&>, + Ukn>(), ""); +static_assert(is_type<std::common_type<volatile Ukn&&, volatile Ukn&&>, Ukn>(), ""); -#endif static_assert(is_type<std::common_type<X1, X2>, RX12>(), ""); static_assert(is_type<std::common_type<X2, X1>, RX21>(), ""); |