* class.c (finish_struct_1): Use OVL_CURRENT in error message.

From-SVN: r19829

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 17701ecf1ac6bc76ae83ff98ddc6d2916505aa01..b7757ae6b2f2268f5d7f1e541bdaee34f6ec5540 100644 (file)
--- 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 99284d65525a063906bdb246dd59e03651decca9..d4258db2e178bda81227aae3c7f59ae292d35ce3 100644 (file)
--- 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;
              }
        }