From 7207d957dcc2425fc89bab11efd6c5941d630956 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 24 Mar 2010 21:14:12 +0200
Subject: Use nil_lit instead of nil as identifier

Some headers in OS X define nil as a macro.
---
 libxsd/xsd/cxx/parser/non-validating/parser.txx | 6 +++---
 libxsd/xsd/cxx/parser/validating/parser.txx     | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'libxsd/xsd/cxx/parser')

diff --git a/libxsd/xsd/cxx/parser/non-validating/parser.txx b/libxsd/xsd/cxx/parser/non-validating/parser.txx
index b4aee3d..2b7cdf7 100644
--- a/libxsd/xsd/cxx/parser/non-validating/parser.txx
+++ b/libxsd/xsd/cxx/parser/non-validating/parser.txx
@@ -114,7 +114,7 @@ namespace xsd
           //
           if (ns == xml::bits::xsi_namespace<C> () &&
               (name == xml::bits::type<C> () ||
-               name == xml::bits::nil<C> () ||
+               name == xml::bits::nil_lit<C> () ||
                name == xml::bits::schema_location<C> () ||
                name == xml::bits::no_namespace_schema_location<C> ()))
             return;
@@ -153,7 +153,7 @@ namespace xsd
           //
           if (ns == xml::bits::xsi_namespace<C> () &&
               (name == xml::bits::type<C> () ||
-               name == xml::bits::nil<C> () ||
+               name == xml::bits::nil_lit<C> () ||
                name == xml::bits::schema_location<C> () ||
                name == xml::bits::no_namespace_schema_location<C> ()))
             return;
@@ -276,7 +276,7 @@ namespace xsd
           //
           if (ns == xml::bits::xsi_namespace<C> () &&
               (name == xml::bits::type<C> () ||
-               name == xml::bits::nil<C> () ||
+               name == xml::bits::nil_lit<C> () ||
                name == xml::bits::schema_location<C> () ||
                name == xml::bits::no_namespace_schema_location<C> ()))
             return;
diff --git a/libxsd/xsd/cxx/parser/validating/parser.txx b/libxsd/xsd/cxx/parser/validating/parser.txx
index e7992ca..8d7f275 100644
--- a/libxsd/xsd/cxx/parser/validating/parser.txx
+++ b/libxsd/xsd/cxx/parser/validating/parser.txx
@@ -118,7 +118,7 @@ namespace xsd
           //
           if (ns == xml::bits::xsi_namespace<C> () &&
               (name == xml::bits::type<C> () ||
-               name == xml::bits::nil<C> () ||
+               name == xml::bits::nil_lit<C> () ||
                name == xml::bits::schema_location<C> () ||
                name == xml::bits::no_namespace_schema_location<C> ()))
             return;
@@ -207,7 +207,7 @@ namespace xsd
           //
           if (ns == xml::bits::xsi_namespace<C> () &&
               (name == xml::bits::type<C> () ||
-               name == xml::bits::nil<C> () ||
+               name == xml::bits::nil_lit<C> () ||
                name == xml::bits::schema_location<C> () ||
                name == xml::bits::no_namespace_schema_location<C> ()))
             return;
@@ -402,7 +402,7 @@ namespace xsd
           //
           if (ns == xml::bits::xsi_namespace<C> () &&
               (name == xml::bits::type<C> () ||
-               name == xml::bits::nil<C> () ||
+               name == xml::bits::nil_lit<C> () ||
                name == xml::bits::schema_location<C> () ||
                name == xml::bits::no_namespace_schema_location<C> ()))
             return;
-- 
cgit v1.1