diff options
| author | Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net> | 2002-07-02 16:06:49 +0000 |
|---|---|---|
| committer | Kriang Lerdsuwanakij <lerdsuwa@gcc.gnu.org> | 2002-07-02 16:06:49 +0000 |
| commit | 04c4491db6c776fa78350a42cdfefed45a25b005 (patch) | |
| tree | 044a601c2b8860fc523b300adf9e403af223468d | |
| parent | 17f296378b2ed38dfd53e9b97dad214cde5bf1c1 (diff) | |
| download | gcc-04c4491db6c776fa78350a42cdfefed45a25b005.zip gcc-04c4491db6c776fa78350a42cdfefed45a25b005.tar.gz gcc-04c4491db6c776fa78350a42cdfefed45a25b005.tar.bz2 | |
typeck2.c (incomplete_type_error): Fix typo caused by CVS conflict in my last patch.
* typeck2.c (incomplete_type_error): Fix typo caused by
CVS conflict in my last patch.
From-SVN: r55183
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/typeck2.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 7382cb3..1c40622 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,10 @@ 2002-07-02 Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net> + * typeck2.c (incomplete_type_error): Fix typo caused by + CVS conflict in my last patch. + +2002-07-02 Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net> + PR c++/6716 * pt.c (can_complete_type_without_circularity): New function. (instantiate_class_template): Use it. diff --git a/gcc/cp/typeck2.c b/gcc/cp/typeck2.c index 8700a4f..fa64743 100644 --- a/gcc/cp/typeck2.c +++ b/gcc/cp/typeck2.c @@ -230,7 +230,7 @@ retry: if (!TYPE_TEMPLATE_INFO (type)) (*p_msg_at) ("forward declaration of `%#T'", type); else - (*p_msg_at) ("forward declaration of `%#T'", type); + (*p_msg_at) ("declaration of `%#T'", type); break; case VOID_TYPE: |