* typeck.c (common_type): Call lookup_attribute instead of value_member.

From-SVN: r9526

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 20fc5bebfe943b65de99e1b85fdc4bb5f3645bfa..f11cf726667475ff37d4e4566a55fc22e9c02941 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+Thu Apr 27 21:49:36 1995  Doug Evans  <dje@cygnus.com>
+
+       * typeck.c (common_type): Call lookup_attribute instead of
+       value_member.
+
 Tue Apr 25 18:07:43 1995  Richard Kenner  (kenner@vlsi1.ultra.nyu.edu)
 
        * Make-lang.in: Change "realclean" to "maintainer-clean".

diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index 71846dabd82ff77e6eee731e43b4d16c07f63211..afdd357e28d2be1279861427b1c963c0f75ca60e 100644 (file)
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -286,14 +286,15 @@ common_type (t1, t2)
          attributes = a2;
        else
        {
-         /* Pick the longest list, and hang on the other
-            list.  */
+         /* Pick the longest list, and hang on the other list.  */
+         /* ??? For the moment we punt on the issue of attrs with args.  */
        
          if (list_length (a1) < list_length (a2))
             attributes = a2, a2 = a1;
 
          for (; a2; a2 = TREE_CHAIN (a2))
-            if (!value_member (attributes, a2))
+           if (lookup_attribute (IDENTIFIER_POINTER (TREE_PURPOSE (a2)),
+                                 attributes) == NULL_TREE)
              {
                a1 = copy_node (a2);
                TREE_CHAIN (a1) = attributes;