diff options
4 files changed, 13 insertions, 4 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 1e7d84e..96fe704 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,12 @@ +2014-05-16 Jonathan Wakely <jwakely@redhat.com> + + * testsuite/20_util/make_unsigned/requirements/typedefs-1.cc: Fix + test for 32-bit target. + * testsuite/20_util/make_unsigned/requirements/typedefs-2.cc: + Likewise. + * testsuite/tr1/2_general_utilities/shared_ptr/modifiers/reset_neg.cc: + Fix test. + 2014-05-16 Alexey Merzlyakov <alexey.merzlyakov@samsung.com> PR libstdc++/60758 diff --git a/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-1.cc b/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-1.cc index a893ede..d9f13aa 100644 --- a/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-1.cc +++ b/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-1.cc @@ -49,7 +49,7 @@ void test01() #ifdef _GLIBCXX_USE_WCHAR_T typedef make_unsigned<volatile wchar_t>::type test23_type; - static_assert(is_same<test23_type, volatile unsigned wchar_t>::value, ""); + static_assert(is_unsigned<test23_type>::value, ""); #endif // Chapter 48, chapter 20. Smallest rank such that new unsigned type diff --git a/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-2.cc b/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-2.cc index 637b0c7..807e2bf 100644 --- a/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-2.cc +++ b/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-2.cc @@ -30,6 +30,7 @@ void test01() { using std::make_unsigned; using std::is_same; + using std::is_unsigned; // Positive tests. typedef make_unsigned<const unsigned int>::type test2_type; @@ -50,7 +51,7 @@ void test01() #ifdef _GLIBCXX_USE_WCHAR_T typedef make_unsigned<volatile wchar_t>::type test23_type; - static_assert(is_same<test23_type, volatile unsigned wchar_t>::value, ""); + static_assert(is_unsigned<test23_type>::value, ""); #endif typedef make_unsigned<test_enum>::type test24_type; diff --git a/libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/modifiers/reset_neg.cc b/libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/modifiers/reset_neg.cc index 26fc3d0..dd52a70 100644 --- a/libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/modifiers/reset_neg.cc +++ b/libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/modifiers/reset_neg.cc @@ -33,8 +33,7 @@ test01() bool test __attribute__((unused)) = true; const std::tr1::shared_ptr<A> p1(new A); - p1.reset(); // { dg-error "discards qualifiers" } - // { dg-error "no match" "" { target *-*-* } 36 } + p1.reset(); // { dg-error "no match" } return 0; } |