* typeck2.c (process_init_constructor): Fix labeled init check.

From-SVN: r18214

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index d4f4fee74f3a8266a644d79ed732a1aea9f287d2..75ff86cdd0532aec37c23d58e3bbe154c9dfe7f5 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb 24 00:36:43 1998  Jason Merrill  <jason@yorick.cygnus.com>
+
+       * typeck2.c (process_init_constructor): Fix labeled init check.
+
 Mon Feb 23 05:08:55 1998  Jason Merrill  <jason@yorick.cygnus.com>
 
        * pt.c, call.c, decl.c, method.c, cp-tree.h: Remove unused NARGS

diff --git a/gcc/cp/typeck2.c b/gcc/cp/typeck2.c
index 35dccd75f2a512b7e966338bbe775c44ff7c4637..21f90cb51e85d061b7961b6a8b2fcceb15e37667 100644 (file)
--- a/gcc/cp/typeck2.c
+++ b/gcc/cp/typeck2.c
@@ -1044,6 +1044,7 @@ process_init_constructor (type, init, elts)
            continue;
 
          if (TREE_PURPOSE (tail)
+             && TREE_PURPOSE (tail) != field
              && TREE_PURPOSE (tail) != DECL_NAME (field))
            sorry ("non-trivial labeled initializers");