aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin v. Löwis <loewis@informatik.hu-berlin.de>1998-05-17 21:52:15 -0400
committerJason Merrill <jason@gcc.gnu.org>1998-05-17 21:52:15 -0400
commit95480b77a28056956966246a8bb709018f6e09f6 (patch)
treeb140459a8f13b1dd8e2dd329ea6dcec4c33b32f5
parent7e717196997438ed21b6866df4d49cd2a4e98174 (diff)
downloadgcc-95480b77a28056956966246a8bb709018f6e09f6.zip
gcc-95480b77a28056956966246a8bb709018f6e09f6.tar.gz
gcc-95480b77a28056956966246a8bb709018f6e09f6.tar.bz2
* class.c (finish_struct_1): Use OVL_CURRENT in error message.
From-SVN: r19829
-rw-r--r--gcc/cp/ChangeLog4
-rw-r--r--gcc/cp/class.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 17701ec..b7757ae 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+Mon May 18 01:43:01 1998 Martin v. Loewis <loewis@informatik.hu-berlin.de>
+
+ * 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 99284d6..d4258db 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;
}
}