diff options
author | Mark Mitchell <mark@codesourcery.com> | 2002-03-18 07:39:24 +0000 |
---|---|---|
committer | Mark Mitchell <mmitchel@gcc.gnu.org> | 2002-03-18 07:39:24 +0000 |
commit | e9dd7bfdf5e46c733752b6c53d54be67b8613a09 (patch) | |
tree | be813f5c6a5bd1550ad9c93a67946aa528e2f1f4 | |
parent | 1b5a2139c727f3cbc99fe7d161ee5f06d19e5280 (diff) | |
download | gcc-e9dd7bfdf5e46c733752b6c53d54be67b8613a09.zip gcc-e9dd7bfdf5e46c733752b6c53d54be67b8613a09.tar.gz gcc-e9dd7bfdf5e46c733752b6c53d54be67b8613a09.tar.bz2 |
qualttp20.C: Revert previous change.
* g++.dg/template/qualttp20.C: Revert previous change.
* g++.dg/template/qualttp3.C: Likewise.
* g++.dg/template/qualttp4.C: Likewise
* g++.dg/template/qualttp5.C: Likewise
* g++.dg/template/qualttp6.C: Likewise
* g++.dg/template/qualttp7.C: Likewise
* g++.dg/template/qualttp8.C: Likewise
* g++.dg/template/recurse.C: Likewise.
From-SVN: r50946
-rw-r--r-- | gcc/testsuite/ChangeLog | 11 | ||||
-rw-r--r-- | gcc/testsuite/g++.dg/template/qualttp20.C | 4 | ||||
-rw-r--r-- | gcc/testsuite/g++.dg/template/qualttp3.C | 4 | ||||
-rw-r--r-- | gcc/testsuite/g++.dg/template/qualttp4.C | 4 | ||||
-rw-r--r-- | gcc/testsuite/g++.dg/template/qualttp5.C | 6 | ||||
-rw-r--r-- | gcc/testsuite/g++.dg/template/qualttp6.C | 4 | ||||
-rw-r--r-- | gcc/testsuite/g++.dg/template/qualttp7.C | 4 | ||||
-rw-r--r-- | gcc/testsuite/g++.dg/template/qualttp8.C | 4 | ||||
-rw-r--r-- | gcc/testsuite/g++.dg/template/recurse.C | 2 |
9 files changed, 27 insertions, 16 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 42b5fb7..2b1e3dc 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,14 @@ +2002-03-17 Mark Mitchell <mark@codesourcery.com> + + * g++.dg/template/qualttp20.C: Revert previous change. + * g++.dg/template/qualttp3.C: Likewise. + * g++.dg/template/qualttp4.C: Likewise + * g++.dg/template/qualttp5.C: Likewise + * g++.dg/template/qualttp6.C: Likewise + * g++.dg/template/qualttp7.C: Likewise + * g++.dg/template/qualttp8.C: Likewise + * g++.dg/template/recurse.C: Likewise. + 2002-03-17 Neil Booth <neil@daikokuya.demon.co.uk> * gcc.dg/cpp/wchar-1.c: Update. diff --git a/gcc/testsuite/g++.dg/template/qualttp20.C b/gcc/testsuite/g++.dg/template/qualttp20.C index f0afbe4..2c6c714 100644 --- a/gcc/testsuite/g++.dg/template/qualttp20.C +++ b/gcc/testsuite/g++.dg/template/qualttp20.C @@ -1,6 +1,6 @@ // { dg-do compile } -// Copyright (C) 2001, 2002 Free Software Foundation, Inc. +// Copyright (C) 2001 Free Software Foundation, Inc. // Contributed by Nathan Sidwell 15 Dec 2001 <nathan@codesourcery.com> // PR 2645 @@ -29,5 +29,5 @@ template <typename T> struct B2 : T myconst b; }; -B1<AS> b1; +B1<AS> b1; // { dg-error "instantiated" "" } B2<AS> b2; diff --git a/gcc/testsuite/g++.dg/template/qualttp3.C b/gcc/testsuite/g++.dg/template/qualttp3.C index ed65bad..929fa62 100644 --- a/gcc/testsuite/g++.dg/template/qualttp3.C +++ b/gcc/testsuite/g++.dg/template/qualttp3.C @@ -1,4 +1,4 @@ -// Copyright (C) 2001, 2002 Free Software Foundation +// Copyright (C) 2001 Free Software Foundation // Contributed by Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net> // { dg-do compile } @@ -19,5 +19,5 @@ template <class T> struct C int main() { - C<A> c; + C<A> c; // { dg-error "instantiated" } } diff --git a/gcc/testsuite/g++.dg/template/qualttp4.C b/gcc/testsuite/g++.dg/template/qualttp4.C index 489460a..04335f1 100644 --- a/gcc/testsuite/g++.dg/template/qualttp4.C +++ b/gcc/testsuite/g++.dg/template/qualttp4.C @@ -1,4 +1,4 @@ -// Copyright (C) 2001, 2002 Free Software Foundation +// Copyright (C) 2001 Free Software Foundation // Contributed by Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net> // { dg-do compile } @@ -20,5 +20,5 @@ template <class T> struct C int main() { - C<A> c; + C<A> c; // { dg-error "instantiated" } } diff --git a/gcc/testsuite/g++.dg/template/qualttp5.C b/gcc/testsuite/g++.dg/template/qualttp5.C index b53ec22..7ac7a31 100644 --- a/gcc/testsuite/g++.dg/template/qualttp5.C +++ b/gcc/testsuite/g++.dg/template/qualttp5.C @@ -1,4 +1,4 @@ -// Copyright (C) 2001, 2002 Free Software Foundation +// Copyright (C) 2001 Free Software Foundation // Contributed by Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net> // { dg-do compile } @@ -15,11 +15,11 @@ template <template <class> class TT> void f() template <class T> struct C { - void g() { f<A<T>::template B>(); } + void g() { f<A<T>::template B>(); } // { dg-error "instantiated" } }; int main() { C<int> c; - c.g(); + c.g(); // { dg-error "instantiated" } } diff --git a/gcc/testsuite/g++.dg/template/qualttp6.C b/gcc/testsuite/g++.dg/template/qualttp6.C index 1796f12..0468958 100644 --- a/gcc/testsuite/g++.dg/template/qualttp6.C +++ b/gcc/testsuite/g++.dg/template/qualttp6.C @@ -1,4 +1,4 @@ -// Copyright (C) 2001, 2002 Free Software Foundation +// Copyright (C) 2001 Free Software Foundation // Contributed by Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net> // { dg-do compile } @@ -12,4 +12,4 @@ template <class T> struct D { struct E { }; -D<E> d; +D<E> d; // { dg-error "instantiated" } diff --git a/gcc/testsuite/g++.dg/template/qualttp7.C b/gcc/testsuite/g++.dg/template/qualttp7.C index 5f15e03..f6573ac 100644 --- a/gcc/testsuite/g++.dg/template/qualttp7.C +++ b/gcc/testsuite/g++.dg/template/qualttp7.C @@ -1,4 +1,4 @@ -// Copyright (C) 2001, 2002 Free Software Foundation +// Copyright (C) 2001 Free Software Foundation // Contributed by Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net> // { dg-do compile } @@ -9,4 +9,4 @@ template <class T> struct D { C<T::template B> c; // { dg-error "no class template" } }; -D<int> d; +D<int> d; // { dg-error "instantiated" } diff --git a/gcc/testsuite/g++.dg/template/qualttp8.C b/gcc/testsuite/g++.dg/template/qualttp8.C index e9389df..da67a09 100644 --- a/gcc/testsuite/g++.dg/template/qualttp8.C +++ b/gcc/testsuite/g++.dg/template/qualttp8.C @@ -1,4 +1,4 @@ -// Copyright (C) 2001, 2002 Free Software Foundation +// Copyright (C) 2001 Free Software Foundation // Contributed by Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net> // { dg-do compile } @@ -14,4 +14,4 @@ struct E { template <class T> class B {}; // { dg-error "private" } }; -D<E> d; +D<E> d; // { dg-error "instantiated" } diff --git a/gcc/testsuite/g++.dg/template/recurse.C b/gcc/testsuite/g++.dg/template/recurse.C index af6dbfa..61b9409 100644 --- a/gcc/testsuite/g++.dg/template/recurse.C +++ b/gcc/testsuite/g++.dg/template/recurse.C @@ -18,5 +18,5 @@ template <> struct F<52> int main () { F<1> f; - return f(); + return f(); // { dg-error "instantiate" "excessive recursion" } } |