From 3605b283e8be90c330490d12d95af51a588f7e52 Mon Sep 17 00:00:00 2001 From: Kriang Lerdsuwanakij Date: Mon, 13 Aug 2001 10:03:45 +0000 Subject: [PATCH] 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 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/decl2.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 29894a3a3fcc..18b2c3830550 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2001-08-13 Kriang Lerdsuwanakij + + * decl2.c (do_nonmember_using_decl): Replace using directive + with using declaration in the error message. + 2001-08-11 Kriang Lerdsuwanakij * 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 0a9e5ad817c5..7be336817988 100644 --- 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; } -- 2.47.2