From 66813b92fa040f5b56ef6407ed5cae141cdf95ef Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 26 May 2010 17:15:04 +0200
Subject: Avoid using id as identifier

It can confuse older versions of g++ in Objective-C++ mode.
---
 libxsd/xsd/cxx/tree/elements.hxx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libxsd/xsd/cxx/tree/elements.hxx b/libxsd/xsd/cxx/tree/elements.hxx
index 403fdb3..805b32a 100644
--- a/libxsd/xsd/cxx/tree/elements.hxx
+++ b/libxsd/xsd/cxx/tree/elements.hxx
@@ -628,7 +628,7 @@ namespace xsd
         //@cond
 
         void
-        _register_id (const identity& id, type* t)
+        _register_id (const identity& i, type* t)
         {
           // We should be the root.
           //
@@ -641,9 +641,9 @@ namespace xsd
           }
 
           if (!map_->insert (
-                std::pair<const identity*, type*> (&id, t)).second)
+                std::pair<const identity*, type*> (&i, t)).second)
           {
-            id.throw_duplicate_id ();
+            i.throw_duplicate_id ();
           }
         }
 
-- 
cgit v1.1