From 95480b77a28056956966246a8bb709018f6e09f6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Sun, 17 May 1998 21:52:15 -0400 Subject: [PATCH] * class.c (finish_struct_1): Use OVL_CURRENT in error message. From-SVN: r19829 --- gcc/cp/ChangeLog | 4 ++++ gcc/cp/class.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 17701ecf1ac..b7757ae6b2f 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +Mon May 18 01:43:01 1998 Martin v. Loewis + + * class.c (finish_struct_1): Use OVL_CURRENT in error message. + Mon May 18 01:24:08 1998 Jeffrey A Law (law@cygnus.com) * Makefile.in (program_transform_name, objdir): Define. diff --git a/gcc/cp/class.c b/gcc/cp/class.c index 99284d65525..d4258db2e17 100644 --- a/gcc/cp/class.c +++ b/gcc/cp/class.c @@ -3710,7 +3710,7 @@ finish_struct_1 (t, warn_anon) { cp_error ("cannot adjust access to `%#D' in `%#T'", fdecl, t); cp_error_at (" because of local method `%#D' with same name", - TREE_VEC_ELT (method_vec, i)); + OVL_CURRENT (TREE_VEC_ELT (method_vec, i))); fdecl = NULL_TREE; break; } @@ -3827,7 +3827,7 @@ finish_struct_1 (t, warn_anon) { cp_error_at ("data member `%#D' conflicts with", x); cp_error_at ("function member `%#D'", - TREE_VEC_ELT (method_vec, i)); + OVL_CURRENT (TREE_VEC_ELT (method_vec, i))); break; } } -- 2.30.2