* decl2.c (do_nonmember_using_decl): Replace using directive

	with using declaration in the error message.

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

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 29894a3a3fcc14c16b593a6262628735d9a2c1bc..18b2c38305509c9e4f684a5276d4c91b85043f61 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-13  Kriang Lerdsuwanakij  <lerdsuwa@users.sourceforge.net>
+
+       * decl2.c (do_nonmember_using_decl): Replace using directive
+       with using declaration in the error message.
+
 2001-08-11  Kriang Lerdsuwanakij  <lerdsuwa@users.sourceforge.net>
 
        * pt.c (maybe_fold_nontype_arg): Use TREE_TYPE of ARG as the

diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index 0a9e5ad817c5ebbadb1f1a1f9e609fa07ac6b7b4..7be3368179887c81e7ff569f455845a36b2b6ab8 100644 (file)
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -5022,7 +5022,7 @@ do_nonmember_using_decl (scope, name, oldval, oldtype, newval, newtype)
   *newtype = BINDING_TYPE (decls);
   if (oldtype && *newtype && oldtype != *newtype)
     {
-      cp_error ("using directive `%D' introduced ambiguous type `%T'",
+      cp_error ("using declaration `%D' introduced ambiguous type `%T'",
                name, oldtype);
       return;
     }