4 files changed, 45 insertions, 0 deletions
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 <fjahanian@apple.com>
+
+	Radar 4508851
+	* parser.c (cp_parser_objc_interstitial_code): Recognize
+	and parse RID_NAMESPACE keyword.
+
 2006-04-13  Devang Patel  <dpatel@apple.com>
 
 	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 <fjahanian@apple.com>
+
+	Radar 4508851
+	* obj-c++.dg/method-namespace-1.mm: New.
+
 2006-04-12 Fariborz Jahanian <fjahanian@apple.com>
 
 	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