[svn:parrot] r48881 - trunk/src

[mikehh at svn.parrot.org]

Author: mikehh
Date: Thu Sep  9 13:17:00 2010
New Revision: 48881
URL: https://trac.parrot.org/parrot/changeset/48881

Log:
fix g++ build - namespace is a reserved word in C++

Modified:
   trunk/src/namespace.c

Modified: trunk/src/namespace.c
==============================================================================
--- trunk/src/namespace.c	Thu Sep  9 07:14:58 2010	(r48880)
+++ trunk/src/namespace.c	Thu Sep  9 13:17:00 2010	(r48881)
@@ -1,5 +1,5 @@
 /*
-Copyright (C) 2004-2009, Parrot Foundation.
+Copyright (C) 2004-2010, Parrot Foundation.
 $Id$
 
 =head1 NAME
@@ -131,12 +131,12 @@
     ARGIN(STRING *key), int flags)
 {
     ASSERT_ARGS(internal_ns_keyed_str)
-    PMC    * const ns        = VTABLE_get_pmc_keyed_str(interp, base_ns, key);
-    STRING * const namespace = CONST_STRING(interp, "NameSpace");
+    PMC    * const ns     = VTABLE_get_pmc_keyed_str(interp, base_ns, key);
+    STRING * const namesp = CONST_STRING(interp, "NameSpace");
 
     if (!PMC_IS_NULL(ns)
     && (ns->vtable->base_type == enum_class_NameSpace
-     || VTABLE_isa(interp, ns, namespace)))
+     || VTABLE_isa(interp, ns, namesp)))
         return ns;
 
     return internal_ns_maybe_create(interp, base_ns, key, flags);