http://gcc.gnu.org/bugzilla/show_bug.cgi?id=27377
--- Comment #13 from Nicola Pero <nicola at gcc dot gnu.org> 2010-09-27 18:04:14 UTC --- Author: nicola Date: Mon Sep 27 18:04:09 2010 New Revision: 164655 URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=164655 Log: In gcc/: 2010-09-27 Nicola Pero <nicola.p...@meta-innovation.com> Merge from 'apple/trunk' branch on FSF servers. Removed small change in build_conditional_expr that had been added when fixing PR objc/27377 and which did the same check in a less complete way. 2005-12-15 Fariborz Jahanian <fjahan...@apple.com> Radar 4229905 * c-typeck.c (build_conditional_expr): Call objc_have_common_type when looking for objective-c common pointer types. 2005-06-22 Ziemowit Laski <zla...@apple.com> Radar 4154928 * c-typeck.c (build_conditional_expr): For two ObjC pointer types, use their ObjC common type. In gcc/c-family: 2010-09-27 Nicola Pero <nicola.p...@meta-innovation.com> Merge from 'apple/trunk' branch on FSF servers. 2005-12-15 Fariborz Jahanian <fjahan...@apple.com> Radar 4229905 * c-common.h (objc_have_common_type): New declaration. * stub-objc.c (objc_have_common_type): New stub. 2005-06-22 Ziemowit Laski <zla...@apple.com> Radar 4154928 * c-common.h (objc_common_type): New prototype. * stub-objc.c (objc_common_type): New stub. In gcc/objc/: 2010-09-27 Nicola Pero <nicola.p...@meta-innovation.com> Merge from 'apple/trunk' branch on FSF servers. 2005-12-15 Fariborz Jahanian <fjahan...@apple.com> Radar 4229905 * objc-act.c (objc_have_common_types): New function. 2005-06-22 Ziemowit Laski <zla...@apple.com> Radar 4154928 * objc-act.c (objc_common_type): New function. In gcc/cp/: 2010-09-27 Nicola Pero <nicola.p...@meta-innovation.com> Merge from apple/trunk branch on FSF servers: 2005-12-15 Fariborz Jahanian <fjahan...@apple.com> Radar 4229905 * typeck.c (composite_pointer_type): Call objc_have_common_type when comparing two objective-c pointer types. 2005-06-22 Ziemowit Laski <zla...@apple.com> Radar 4154928 * call.c (standard_conversion): Allow for a pointer conversion between any two ObjC pointer types. * typeck.c (composite_pointer_type): Determine common type for two ObjC pointer types. In gcc/testsuite/: 2010-09-27 Nicola Pero <nicola.p...@meta-innovation.com> Merge from 'apple/trunk' branch on FSF servers. Renamed const-str-12.m to constr-str-12b.m to avoid conflicts. 2005-12-15 Fariborz Jahanian <fjahan...@apple.com> Radar 4229905 * obj-c++.dg/warn5.mm: New 2005-06-22 Ziemowit Laski <zla...@apple.com> Radar 4154928 * obj-c++.dg/const-str-12.mm: New. * objc.dg/const-str-12.m: New. Added: trunk/gcc/testsuite/obj-c++.dg/const-str-12.mm trunk/gcc/testsuite/obj-c++.dg/warn5.mm trunk/gcc/testsuite/objc.dg/const-str-12b.m Modified: trunk/gcc/ChangeLog trunk/gcc/c-family/ChangeLog trunk/gcc/c-family/c-common.h trunk/gcc/c-family/stub-objc.c trunk/gcc/c-typeck.c trunk/gcc/cp/ChangeLog trunk/gcc/cp/call.c trunk/gcc/cp/typeck.c trunk/gcc/objc/ChangeLog trunk/gcc/objc/objc-act.c trunk/gcc/testsuite/ChangeLog