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

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 7382cb3dda08e77ea622afccc2267687bdd3a247..1c406224aa692242ff45c82e9fc815350ec63075 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+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

diff --git a/gcc/cp/typeck2.c b/gcc/cp/typeck2.c
index 8700a4fe2876f5a8a39d87a67da8238f5d8aeec5..fa6474330c90e3c37cf0aec08d330997735b2a07 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: