diff options
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/decl2.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 29894a3..18b2c38 100644 --- 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 0a9e5ad..7be3368 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; } |