===================================================================
@@ -1,7 +1,16 @@
2010-10-17 Nicola Pero <nicola.pero@meta-innovation.com>
Merge from 'apple/trunk' branch on FSF servers.
+
+ 2006-04-19 Fariborz Jahanian <fjahanian@apple.com>
+ Radar 4516785
+ * obj-c++.dg/method-namespace-2.mm: New.
+
+2010-10-17 Nicola Pero <nicola.pero@meta-innovation.com>
+
+ Merge from 'apple/trunk' branch on FSF servers.
+
2006-03-27 Fariborz Jahanian <fjahanian@apple.com>
Radar 4133425
===================================================================
@@ -0,0 +1,25 @@
+/* Test that qualified type is resolved to its proper type. */
+/* { dg-do compile } */
+
+@interface Object
+{
+ int I[100];
+}
+@end
+
+namespace HC
+{
+
+struct Object
+{
+ void test();
+};
+
+} // namespace HC
+
+int main()
+{
+ HC::Object* object;
+ object->test(); // Must compile with no error
+ return 0;
+}
===================================================================
@@ -1,7 +1,17 @@
2010-10-17 Nicola Pero <nicola.pero@meta-innovation.com>
Merge from apple/trunk branch on FSF servers.
+
+ 2006-04-19 Fariborz Jahanian <fjahanian@apple.com>
+
+ Radar 4516785
+ * parser.c (cp_parser_simple_type_specifier): Don't lookup for
+ objc object types if type is scope qualified.
+2010-10-17 Nicola Pero <nicola.pero@meta-innovation.com>
+
+ Merge from apple/trunk branch on FSF servers.
+
2006-03-27 Fariborz Jahanian <fjahanian@apple.com>
Radar 4133425
===================================================================
@@ -12753,7 +12753,7 @@ cp_parser_simple_type_specifier (cp_parser* parser
/* As a last-ditch effort, see if TYPE is an Objective-C type.
If it is, then the '<'...'>' enclose protocol names rather than
template arguments, and so everything is fine. */
- if (c_dialect_objc ()
+ if (c_dialect_objc () && !parser->scope
&& (objc_is_id (type) || objc_is_class_name (type)))
{
tree protos = cp_parser_objc_protocol_refs_opt (parser);