aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2010-05-26 17:15:04 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2010-05-26 17:15:04 +0200
commit66813b92fa040f5b56ef6407ed5cae141cdf95ef (patch)
tree84dc9ed7fadc9d971f35108d0b03eb9a320956b6
parentce1e0bc0ae5a8a63b43dc9ad9b32a5da80e1da68 (diff)
Avoid using id as identifier
It can confuse older versions of g++ in Objective-C++ mode.
-rw-r--r--libxsd/xsd/cxx/tree/elements.hxx6
1 files 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 ();
}
}