From 4abfc532e3ffc6353597404a1784013cfbeaef70 Mon Sep 17 00:00:00 2001 From: nicola Date: Mon, 27 Sep 2010 18:04:09 +0000 Subject: In gcc/: 2010-09-27 Nicola Pero 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 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 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 Merge from 'apple/trunk' branch on FSF servers. 2005-12-15 Fariborz Jahanian 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 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 Merge from 'apple/trunk' branch on FSF servers. 2005-12-15 Fariborz Jahanian Radar 4229905 * objc-act.c (objc_have_common_types): New function. 2005-06-22 Ziemowit Laski Radar 4154928 * objc-act.c (objc_common_type): New function. In gcc/cp/: 2010-09-27 Nicola Pero Merge from apple/trunk branch on FSF servers: 2005-12-15 Fariborz Jahanian Radar 4229905 * typeck.c (composite_pointer_type): Call objc_have_common_type when comparing two objective-c pointer types. 2005-06-22 Ziemowit Laski 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 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 Radar 4229905 * obj-c++.dg/warn5.mm: New 2005-06-22 Ziemowit Laski Radar 4154928 * obj-c++.dg/const-str-12.mm: New. * objc.dg/const-str-12.m: New. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@164655 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/c-family/stub-objc.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'gcc/c-family/stub-objc.c') diff --git a/gcc/c-family/stub-objc.c b/gcc/c-family/stub-objc.c index 0ce1feffb41..0384b486fce 100644 --- a/gcc/c-family/stub-objc.c +++ b/gcc/c-family/stub-objc.c @@ -62,6 +62,12 @@ objc_is_reserved_word (tree ARG_UNUSED (ident)) return 0; } +tree +objc_common_type (tree ARG_UNUSED (type1), tree ARG_UNUSED (type2)) +{ + return 0; +} + bool objc_compare_types (tree ARG_UNUSED (ltyp), tree ARG_UNUSED (rtyp), int ARG_UNUSED (argno), tree ARG_UNUSED (callee)) @@ -69,6 +75,13 @@ objc_compare_types (tree ARG_UNUSED (ltyp), tree ARG_UNUSED (rtyp), return false; } +bool +objc_have_common_type (tree ARG_UNUSED (ltyp), tree ARG_UNUSED (rtyp), + int ARG_UNUSED (argno), tree ARG_UNUSED (callee)) +{ + return false; +} + void objc_volatilize_decl (tree ARG_UNUSED (decl)) { -- cgit v1.2.1