From 58f171709f1f504d7251cfc27fae6bb95d085b74 Mon Sep 17 00:00:00 2001 From: Fariborz Jahanian Date: Fri, 14 Apr 2006 17:15:42 +0000 Subject: Radar 4508851 OKed by Mike. git-svn-id: https://gcc.gnu.org/svn/gcc/branches/apple/trunk@112956 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/cp/ChangeLog.apple-ppc | 6 ++++++ gcc/cp/parser.c | 4 ++++ gcc/testsuite/ChangeLog.apple-ppc | 5 +++++ gcc/testsuite/obj-c++.dg/method-namespace-1.mm | 30 ++++++++++++++++++++++++++ 4 files changed, 45 insertions(+) create mode 100644 gcc/testsuite/obj-c++.dg/method-namespace-1.mm diff --git a/gcc/cp/ChangeLog.apple-ppc b/gcc/cp/ChangeLog.apple-ppc index 5ca373185a8..1cca5ab278a 100644 --- a/gcc/cp/ChangeLog.apple-ppc +++ b/gcc/cp/ChangeLog.apple-ppc @@ -1,3 +1,9 @@ +2006-04-14 Fariborz Jahanian + + Radar 4508851 + * parser.c (cp_parser_objc_interstitial_code): Recognize + and parse RID_NAMESPACE keyword. + 2006-04-13 Devang Patel Radar 4503682 diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 1cd6ca693d8..14c1d0580d6 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -18509,6 +18509,10 @@ cp_parser_objc_interstitial_code (cp_parser* parser) objc_set_method_opt (0); } /* APPLE LOCAL end C* language */ + /* APPLE LOCAL begin radar 4508851 */ + else if (token->keyword == RID_NAMESPACE) + cp_parser_namespace_definition (parser); + /* APPLE LOCAL end radar 4508851 */ /* APPLE LOCAL begin 4093475 */ /* Other stray characters must generate errors. */ else if (token->type == CPP_OPEN_BRACE || token->type == CPP_CLOSE_BRACE) diff --git a/gcc/testsuite/ChangeLog.apple-ppc b/gcc/testsuite/ChangeLog.apple-ppc index 3641d1e6024..248e7819c4f 100644 --- a/gcc/testsuite/ChangeLog.apple-ppc +++ b/gcc/testsuite/ChangeLog.apple-ppc @@ -1,3 +1,8 @@ +2006-04-14 Fariborz Jahanian + + Radar 4508851 + * obj-c++.dg/method-namespace-1.mm: New. + 2006-04-12 Fariborz Jahanian Radar 4506893 diff --git a/gcc/testsuite/obj-c++.dg/method-namespace-1.mm b/gcc/testsuite/obj-c++.dg/method-namespace-1.mm new file mode 100644 index 00000000000..c763a59c4c0 --- /dev/null +++ b/gcc/testsuite/obj-c++.dg/method-namespace-1.mm @@ -0,0 +1,30 @@ +/* APPLE LOCAL file radar 4508851 */ +/* Test for usage of namespace inside @implementation. */ +/* { dg-do compile } */ +@interface MyDocument +@end + +@implementation MyDocument + +// This deprecated usage works +static void foo1() { } + +// This preferred usage does _not_ work +namespace + { + void foo2() { } + } + +namespace STD + { + void foo3 () {} + } + +using namespace STD; + +- (void) GARF { + foo2(); + foo3(); +} + +@end -- cgit v1.2.3