diff options
author | Paolo Carlini <paolo.carlini@oracle.com> | 2008-07-16 10:10:41 +0000 |
---|---|---|
committer | Paolo Carlini <paolo@gcc.gnu.org> | 2008-07-16 10:10:41 +0000 |
commit | 751a3fcab3942ec698d97cbb1028dbe12107da1a (patch) | |
tree | 7815b8ff0d44ebf5b91cf6303878bb7d4f785cba /libstdc++-v3 | |
parent | 238fe3c54bfc0cabfca41322ad09f21bfdbced3c (diff) | |
download | gcc-751a3fcab3942ec698d97cbb1028dbe12107da1a.zip gcc-751a3fcab3942ec698d97cbb1028dbe12107da1a.tar.gz gcc-751a3fcab3942ec698d97cbb1028dbe12107da1a.tar.bz2 |
assign_neg.cc: Adjust dg-error lines.
2008-07-16 Paolo Carlini <paolo.carlini@oracle.com>
* testsuite/30_threads/recursive_mutex/cons/assign_neg.cc: Adjust
dg-error lines.
* testsuite/30_threads/recursive_mutex/cons/copy_neg.cc: Likewise.
* testsuite/20_util/duration/cons/1_neg.cc: Likewise.
* include/tr1_impl/type_traits: Fix comment typo.
From-SVN: r137874
Diffstat (limited to 'libstdc++-v3')
5 files changed, 14 insertions, 5 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 322fa80..03bd7b8 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,14 @@ 2008-07-16 Paolo Carlini <paolo.carlini@oracle.com> + * testsuite/30_threads/recursive_mutex/cons/assign_neg.cc: Adjust + dg-error lines. + * testsuite/30_threads/recursive_mutex/cons/copy_neg.cc: Likewise. + * testsuite/20_util/duration/cons/1_neg.cc: Likewise. + + * include/tr1_impl/type_traits: Fix comment typo. + +2008-07-16 Paolo Carlini <paolo.carlini@oracle.com> + * include/bits/unique_ptr.h: Remove stray character. 2008-07-15 Benjamin Kosnik <bkoz@redhat.com> diff --git a/libstdc++-v3/include/tr1_impl/type_traits b/libstdc++-v3/include/tr1_impl/type_traits index 5d0824a..87633fa 100644 --- a/libstdc++-v3/include/tr1_impl/type_traits +++ b/libstdc++-v3/include/tr1_impl/type_traits @@ -235,7 +235,7 @@ _GLIBCXX_BEGIN_NAMESPACE_TR1 template<typename _Tp> struct is_member_pointer; - /// is_scalal + /// is_scalar template<typename _Tp> struct is_scalar : public integral_constant<bool, (is_arithmetic<_Tp>::value diff --git a/libstdc++-v3/testsuite/20_util/duration/cons/1_neg.cc b/libstdc++-v3/testsuite/20_util/duration/cons/1_neg.cc index 8710d74..fa63dab 100644 --- a/libstdc++-v3/testsuite/20_util/duration/cons/1_neg.cc +++ b/libstdc++-v3/testsuite/20_util/duration/cons/1_neg.cc @@ -41,6 +41,6 @@ test02() // { dg-error "instantiated from here" "" { target *-*-* } 30 } // { dg-error "instantiated from here" "" { target *-*-* } 39 } -// { dg-error "not exactly representable" "" { target *-*-* } 202 } -// { dg-error "integral duration with floating point" "" { target *-*-* } 186 } +// { dg-error "not exactly representable" "" { target *-*-* } 203 } +// { dg-error "integral duration with floating point" "" { target *-*-* } 187 } // { dg-excess-errors "In instantiation of" } diff --git a/libstdc++-v3/testsuite/30_threads/recursive_mutex/cons/assign_neg.cc b/libstdc++-v3/testsuite/30_threads/recursive_mutex/cons/assign_neg.cc index ca39974..2e05710 100644 --- a/libstdc++-v3/testsuite/30_threads/recursive_mutex/cons/assign_neg.cc +++ b/libstdc++-v3/testsuite/30_threads/recursive_mutex/cons/assign_neg.cc @@ -39,4 +39,4 @@ void test01() m1 = m2; } // { dg-error "within this context" "" { target *-*-* } 39 } -// { dg-error "is private" "" { target *-*-* } 155 } +// { dg-error "is private" "" { target *-*-* } 154 } diff --git a/libstdc++-v3/testsuite/30_threads/recursive_mutex/cons/copy_neg.cc b/libstdc++-v3/testsuite/30_threads/recursive_mutex/cons/copy_neg.cc index 7f530c3..a98e733 100644 --- a/libstdc++-v3/testsuite/30_threads/recursive_mutex/cons/copy_neg.cc +++ b/libstdc++-v3/testsuite/30_threads/recursive_mutex/cons/copy_neg.cc @@ -38,4 +38,4 @@ void test01() mutex_type m2(m1); } // { dg-error "within this context" "" { target *-*-* } 38 } -// { dg-error "is private" "" { target *-*-* } 154 } +// { dg-error "is private" "" { target *-*-* } 153 } |