aboutsummaryrefslogtreecommitdiff
path: root/libxsd/xsd/cxx/parser
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2010-03-24 21:14:12 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2010-03-24 21:14:12 +0200
commit7207d957dcc2425fc89bab11efd6c5941d630956 (patch)
tree7c15ed1e6fcb6bc11a8bc15e215e6865e0f1b463 /libxsd/xsd/cxx/parser
parent49129dd75396f109664aa0f2fa9c9d67ab464b80 (diff)
Use nil_lit instead of nil as identifier
Some headers in OS X define nil as a macro.
Diffstat (limited to 'libxsd/xsd/cxx/parser')
-rw-r--r--libxsd/xsd/cxx/parser/non-validating/parser.txx6
-rw-r--r--libxsd/xsd/cxx/parser/validating/parser.txx6
2 files changed, 6 insertions, 6 deletions
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;