decl2.c (do_nonmember_using_decl): Replace using directive with using declaration in the error message.

* decl2.c (do_nonmember_using_decl): Replace using directive
	with using declaration in the error message.

From-SVN: r44847
This commit is contained in:
Kriang Lerdsuwanakij 2001-08-13 10:03:45 +00:00 committed by Kriang Lerdsuwanakij
parent 5d0cab94d0
commit 3605b283e8
2 changed files with 6 additions and 1 deletions

View File

@ -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

View File

@ -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;
}