From 7a20efb19c7eadc25323834b9fcb72d3a5fae549 Mon Sep 17 00:00:00 2001 From: mikehh Date: Thu, 9 Sep 2010 13:17:00 +0000 Subject: [PATCH] fix g++ build - namespace is a reserved word in C++ git-svn-id: https://svn.parrot.org/parrot/trunk@48881 d31e2699-5ff4-0310-a27c-f18f2fbe73fe --- src/namespace.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/namespace.c b/src/namespace.c index c216c1dd95..e6145c8a32 100644 --- a/src/namespace.c +++ b/src/namespace.c @@ -1,5 +1,5 @@ /* -Copyright (C) 2004-2009, Parrot Foundation. +Copyright (C) 2004-2010, Parrot Foundation. $Id$ =head1 NAME @@ -131,12 +131,12 @@ internal_ns_keyed_str(PARROT_INTERP, ARGIN(PMC *base_ns), 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); -- 2.11.4.GIT