From 4d3b601fe49b9e5da6716ae03ea827d51cc22715 Mon Sep 17 00:00:00 2001 From: rti Date: Thu, 24 May 2012 16:33:56 +0200 Subject: [PATCH] Fixed: Build on Mac OS X, "id" is a datatype in objective-c(++) --- code/nel/include/nel/misc/entity_id.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/nel/include/nel/misc/entity_id.h b/code/nel/include/nel/misc/entity_id.h index 4ca446941..96b8db223 100644 --- a/code/nel/include/nel/misc/entity_id.h +++ b/code/nel/include/nel/misc/entity_id.h @@ -470,12 +470,12 @@ public: /// return a string in form "(a:b:c:d)" where a,b,c,d are components of entity id. std::string toString() const { - std::string id; - id.reserve(25); - id+='('; - getDebugString (id); - id+=')'; - return id; + std::string ident; + ident.reserve(25); + ident+='('; + getDebugString (ident); + ident+=')'; + return ident; } /// Read from a debug string, use the same format as toString() (id:type:creator:dynamic) in hexadecimal