From 2db70b29ac1642e917d70f08922784c03b47eaf7 Mon Sep 17 00:00:00 2001 From: Doug Evans Date: Fri, 28 Apr 1995 01:52:40 +0000 Subject: * typeck.c (common_type): Call lookup_attribute instead of value_member. From-SVN: r9526 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/typeck.c | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'gcc') diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 20fc5be..f11cf72 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +Thu Apr 27 21:49:36 1995 Doug Evans + + * 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 71846da..afdd357 100644 --- 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; -- cgit v1.1