diff options
-rw-r--r-- | libxsd/xsd/cxx/parser/non-validating/parser.txx | 6 | ||||
-rw-r--r-- | libxsd/xsd/cxx/parser/validating/parser.txx | 6 | ||||
-rw-r--r-- | libxsd/xsd/cxx/xml/bits/literals.hxx | 2 | ||||
-rw-r--r-- | libxsd/xsd/cxx/xml/bits/literals.ixx | 4 |
4 files changed, 9 insertions, 9 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; diff --git a/libxsd/xsd/cxx/xml/bits/literals.hxx b/libxsd/xsd/cxx/xml/bits/literals.hxx index f3ea6a0..5b9fe99 100644 --- a/libxsd/xsd/cxx/xml/bits/literals.hxx +++ b/libxsd/xsd/cxx/xml/bits/literals.hxx @@ -44,7 +44,7 @@ namespace xsd template <typename C> const C* - nil (); + nil_lit (); template <typename C> const C* diff --git a/libxsd/xsd/cxx/xml/bits/literals.ixx b/libxsd/xsd/cxx/xml/bits/literals.ixx index b24375b..f0ec6eb 100644 --- a/libxsd/xsd/cxx/xml/bits/literals.ixx +++ b/libxsd/xsd/cxx/xml/bits/literals.ixx @@ -73,7 +73,7 @@ namespace xsd template <> inline const char* - nil<char> () + nil_lit<char> () { return "nil"; } @@ -199,7 +199,7 @@ namespace xsd template <> inline const wchar_t* - nil<wchar_t> () + nil_lit<wchar_t> () { return L"nil"; } |