* typeck2.c (incomplete_type_error): Fix typo caused by

	CVS conflict in my last patch.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@55183 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 7382cb3..1c40622 100644 (file)
--- 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 (file)
--- 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: