r116329 - in /trunk/gcc: cp/ChangeLog cp/tree.c...

[jason@gcc.gnu.org]

Author: jason
Date: Tue Aug 22 18:27:26 2006
New Revision: 116329

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=116329
Log:
        PR c++/28659
        * typeck.c (merge_types): If either of the types have the right
        attributes, return that one.

        * tree.c (cp_build_type_attribute_variant): Make sure we aren't
        doing this to class types.
        * typeck.c (original_type): Deal with type quals properly.

Added:
    trunk/gcc/testsuite/g++.dg/ext/attrib26.C
Modified:
    trunk/gcc/cp/ChangeLog
    trunk/gcc/cp/tree.c
    trunk/gcc/cp/typeck.c