From 9e21f520fb19163eeac2a9b80a4568dabfc29268 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Thu, 15 Apr 2010 14:30:56 +0200 Subject: Adjust to changed predicate names --- xsd/cxx/parser/parser-source.cxx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'xsd/cxx/parser/parser-source.cxx') diff --git a/xsd/cxx/parser/parser-source.cxx b/xsd/cxx/parser/parser-source.cxx index 339bb6f..99bc566 100644 --- a/xsd/cxx/parser/parser-source.cxx +++ b/xsd/cxx/parser/parser-source.cxx @@ -289,10 +289,10 @@ namespace CXX os << "if ("; - if (poly && e.global ()) + if (poly && e.global_p ()) os << "("; - if (e.qualified () && e.namespace_ ().name ()) + if (e.qualified_p () && e.namespace_ ().name ()) { os << "n == " << strlit (e.name ()) << " && " << "ns == " << strlit (e.namespace_ ().name ()); @@ -304,7 +304,7 @@ namespace CXX // Only a globally-defined element can be a subst-group root. // - if (poly && e.global ()) + if (poly && e.global_p ()) { os << ") ||" << endl << "::xsd::cxx::parser::substitution_map_instance< " << @@ -389,10 +389,10 @@ namespace CXX os << "if ("; - if (poly && e.global ()) + if (poly && e.global_p ()) os << "("; - if (e.qualified () && e.namespace_ ().name ()) + if (e.qualified_p () && e.namespace_ ().name ()) { os << "n == " << strlit (e.name ()) << " && " << "ns == " << strlit (e.namespace_ ().name ()); @@ -404,7 +404,7 @@ namespace CXX // Only a globally-defined element can be a subst-group root. // - if (poly && e.global ()) + if (poly && e.global_p ()) { os << ") ||" << endl << "::xsd::cxx::parser::substitution_map_instance< " << @@ -455,7 +455,7 @@ namespace CXX String const& name (ename (a)); String const& inst (emember (a)); - if (a.qualified () && a.namespace_ ().name ()) + if (a.qualified_p () && a.namespace_ ().name ()) { os << "if (n == " << strlit (a.name ()) << " && " << "ns == " << strlit (a.namespace_ ().name ()) << ")" -- cgit v1.1