From 9e21f520fb19163eeac2a9b80a4568dabfc29268 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 15 Apr 2010 14:30:56 +0200
Subject: Adjust to changed predicate names

---
 xsd/cxx/tree/tree-source.cxx | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'xsd/cxx/tree/tree-source.cxx')

diff --git a/xsd/cxx/tree/tree-source.cxx b/xsd/cxx/tree/tree-source.cxx
index fda9e63..4a17b00 100644
--- a/xsd/cxx/tree/tree-source.cxx
+++ b/xsd/cxx/tree/tree-source.cxx
@@ -557,7 +557,7 @@ namespace CXX
 
           // default_value
           //
-          if (m.default_ ())
+          if (m.default_p ())
           {
             SemanticGraph::Type& t (m.type ());
             Boolean simple (true);
@@ -704,12 +704,12 @@ namespace CXX
                << "::std::auto_ptr< ::xsd::cxx::tree::type > tmp (" << endl
                << "tfm.create (" << endl
                << strlit (e.name ()) << "," << endl
-               << (e.qualified ()
+               << (e.qualified_p ()
                    ? strlit (e.namespace_ ().name ())
                    : L + String ("\"\"")) << "," << endl
                << "&::xsd::cxx::tree::factory_impl< " << type << " >," << endl
-               << (e.global () ? "true" : "false") << ", " <<
-              (e.qualified () ? "true" : "false") << ", " <<
+               << (e.global_p () ? "true" : "false") << ", " <<
+              (e.qualified_p () ? "true" : "false") << ", " <<
               "i, n, f, this));"
                << endl
                << "if (tmp.get () != 0)"
@@ -717,7 +717,7 @@ namespace CXX
           }
           else
           {
-            if (e.qualified () && e.namespace_ ().name ())
+            if (e.qualified_p () && e.namespace_ ().name ())
             {
               os << "if (n.name () == " << strlit (e.name ()) << " && " <<
                 "n.namespace_ () == " << strlit (e.namespace_ ().name ()) << ")"
@@ -878,7 +878,7 @@ namespace CXX
                << "throw ::xsd::cxx::tree::expected_element< " <<
               char_type << " > (" << endl
                << strlit (e.name ()) << "," << endl
-               << (e.qualified ()
+               << (e.qualified_p ()
                    ? strlit (e.namespace_ ().name ())
                    : L + String ("\"\"")) << ");"
                << "}";
@@ -1062,7 +1062,7 @@ namespace CXX
 
           String const& tr (etraits (a)); // traits type name
 
-          if (a.qualified () && a.namespace_ ().name ())
+          if (a.qualified_p () && a.namespace_ ().name ())
           {
             os << "if (n.name () == " << strlit (a.name ()) << " && " <<
               "n.namespace_ () == " << strlit (a.namespace_ ().name ()) << ")"
@@ -1207,12 +1207,12 @@ namespace CXX
         {
           String const& member (emember (a));
 
-          if (!a.optional () || a.default_ ())
+          if (!a.optional_p () || a.default_p ())
           {
             os << "if (!" << member << ".present ())"
                << "{";
 
-            if (a.default_ ())
+            if (a.default_p ())
             {
               os << "this->" << member << ".set (" <<
                 edefault_value (a) << " ());";
@@ -1221,7 +1221,7 @@ namespace CXX
               os << "throw ::xsd::cxx::tree::expected_attribute< " <<
                 char_type << " > (" << endl
                  << strlit (a.name ()) << "," << endl
-                 << (a.qualified ()
+                 << (a.qualified_p ()
                      ? strlit (a.namespace_ ().name ())
                      : L + String ("\"\"")) << ");";
 
@@ -1331,7 +1331,7 @@ namespace CXX
             // Note that we are not including attributes with default
             // or required fixed values here.
             //
-            if (min (a) == 1 && !a.fixed ())
+            if (min (a) == 1 && !a.fixed_p ())
             {
               // one
               //
@@ -1408,7 +1408,7 @@ namespace CXX
         {
           String const& member (emember (a));
 
-          Boolean def (a.default_ ());
+          Boolean def (a.default_p ());
 
           if (min (a) == 0 && !def)
           {
@@ -1644,7 +1644,7 @@ namespace CXX
         {
           String const& member (emember (a));
 
-          if (a.default_ ())
+          if (a.default_p ())
           {
             // This is an attribute with default or fixed value. We are
             // going to initialize it to its default value.
-- 
cgit v1.1