diff options
6 files changed, 19 insertions, 7 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index d5c52fc..6ee0d59 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,15 @@ +2007-07-02 Douglas Gregor <doug.gregor@gmail.com> + + * testsuite/20_util/make_signed/requirements/typedefs_neg.cc: + Tweak line numbers. + * testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc: + Ditto. + * testsuite/20_util/make_unsigned/requirements/typedefs-1.cc: + Don't try to create an unsigned wchar_t. + * testsuite/20_util/make_unsigned/requirements/typedefs-2.cc: + Don't try to create an unsigned wchar_t. + * testsuite/util/testsuite_hooks.h: Remove a stray semicolon. + 2007-07-01 Douglas Gregor <doug.gregor@gmail.com> * include/std/type_traits (__make_unsigned): Remove invalid diff --git a/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs_neg.cc b/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs_neg.cc index db34e04..774dca5 100644 --- a/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs_neg.cc +++ b/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs_neg.cc @@ -49,8 +49,8 @@ void test01() // { dg-error "instantiated from here" "" { target *-*-* } 41 } // { dg-error "instantiated from here" "" { target *-*-* } 43 } -// { dg-error "invalid use of incomplete type" "" { target *-*-* } 497 } -// { dg-error "declaration of" "" { target *-*-* } 463 } +// { dg-error "invalid use of incomplete type" "" { target *-*-* } 489 } +// { dg-error "declaration of" "" { target *-*-* } 455 } // { dg-excess-errors "At global scope" } // { dg-excess-errors "In instantiation of" } 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 1270729..ead941c6 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; - VERIFY( (is_same<test23_type, volatile unsigned wchar_t>::value) ); + VERIFY( (is_same<test23_type, volatile wchar_t>::value) ); #endif typedef make_unsigned<test_enum>::type test25_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 1715d36..0789ef5 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 @@ -49,7 +49,7 @@ void test01() #ifdef _GLIBCXX_USE_WCHAR_T typedef make_unsigned<volatile wchar_t>::type test23_type; - VERIFY( (is_same<test23_type, volatile unsigned wchar_t>::value) ); + VERIFY( (is_same<test23_type, volatile wchar_t>::value) ); #endif typedef make_unsigned<test_enum>::type test25_type; diff --git a/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc b/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc index e64c0e2..56ce7b9 100644 --- a/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc +++ b/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc @@ -49,8 +49,8 @@ void test01() // { dg-error "instantiated from here" "" { target *-*-* } 41 } // { dg-error "instantiated from here" "" { target *-*-* } 43 } -// { dg-error "invalid use of incomplete type" "" { target *-*-* } 418 } -// { dg-error "declaration of" "" { target *-*-* } 384 } +// { dg-error "invalid use of incomplete type" "" { target *-*-* } 414 } +// { dg-error "declaration of" "" { target *-*-* } 380 } // { dg-excess-errors "At global scope" } // { dg-excess-errors "In instantiation of" } diff --git a/libstdc++-v3/testsuite/util/testsuite_hooks.h b/libstdc++-v3/testsuite/util/testsuite_hooks.h index 8e22ec0..d92eef1 100644 --- a/libstdc++-v3/testsuite/util/testsuite_hooks.h +++ b/libstdc++-v3/testsuite/util/testsuite_hooks.h @@ -134,7 +134,7 @@ namespace __gnu_test func_callback(const func_callback&); public: - func_callback(): _M_size(0) { }; + func_callback(): _M_size(0) { } int size() const { return _M_size; } |