From 4d42a8d8ab0ec7066ded83053b0197f292dab473 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 15 Apr 2010 13:53:33 +0200
Subject: Use new predicate name for annotation

---
 xsd/cxx/tree/parser-header.cxx        |  2 +-
 xsd/cxx/tree/serialization-header.cxx |  2 +-
 xsd/cxx/tree/tree-header.cxx          | 18 +++++++++---------
 3 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'xsd')

diff --git a/xsd/cxx/tree/parser-header.cxx b/xsd/cxx/tree/parser-header.cxx
index f4a5f25..c1d1ab9 100644
--- a/xsd/cxx/tree/parser-header.cxx
+++ b/xsd/cxx/tree/parser-header.cxx
@@ -38,7 +38,7 @@ namespace CXX
                << " * @name Parsing functions for the %" <<
 	       comment (e.name ()) << " document root." << endl;
 
-            if (e.annotated ())
+            if (e.annotated_p ())
             {
               os << " *" << endl;
               write_annotation (e.annotation ());
diff --git a/xsd/cxx/tree/serialization-header.cxx b/xsd/cxx/tree/serialization-header.cxx
index 6d832dd..d024a38 100644
--- a/xsd/cxx/tree/serialization-header.cxx
+++ b/xsd/cxx/tree/serialization-header.cxx
@@ -253,7 +253,7 @@ namespace CXX
                << " * @name Serialization functions for the %" <<
 	       comment (e.name ()) << " document root." << endl;
 
-            if (e.annotated ())
+            if (e.annotated_p ())
             {
               os << " *" << endl;
               write_annotation (e.annotation ());
diff --git a/xsd/cxx/tree/tree-header.cxx b/xsd/cxx/tree/tree-header.cxx
index 65fdd65..ed5f081 100644
--- a/xsd/cxx/tree/tree-header.cxx
+++ b/xsd/cxx/tree/tree-header.cxx
@@ -49,7 +49,7 @@ namespace CXX
               "sequence (e.g.," << endl
                << " * std::vector)." << endl;
 
-            if (l.annotated ())
+            if (l.annotated_p ())
             {
               os << " *" << endl;
               write_annotation (l.annotation ());
@@ -338,7 +338,7 @@ namespace CXX
                << " *" << endl
                << " * The mapping represents unions as strings." << endl;
 
-            if (u.annotated ())
+            if (u.annotated_p ())
             {
               os << " *" << endl;
               write_annotation (u.annotation ());
@@ -554,7 +554,7 @@ namespace CXX
         virtual Void
         traverse (Type& e)
         {
-          if (doxygen && e.annotated ())
+          if (doxygen && e.annotated_p ())
           {
             os << "/**" << endl;
             write_annotation (e.annotation ());
@@ -638,7 +638,7 @@ namespace CXX
               comment (e.name ()) << endl
                << " * schema type." << endl;
 
-            if (e.annotated ())
+            if (e.annotated_p ())
             {
               os << " *" << endl;
               write_annotation (e.annotation ());
@@ -1814,7 +1814,7 @@ namespace CXX
               os << "required " << (el ? "element." : "attribute.") << endl;
             }
 
-            if (m.annotated ())
+            if (m.annotated_p ())
             {
               os << " *" << endl;
               write_annotation (m.annotation ());
@@ -1978,7 +1978,7 @@ namespace CXX
                << " * @brief Accessor and modifier functions for the " <<
               "any wildcard." << endl;
 
-            if (a.annotated ())
+            if (a.annotated_p ())
             {
               os << " *" << endl;
               write_annotation (a.annotation ());
@@ -2083,7 +2083,7 @@ namespace CXX
               "anyAttribute" << endl
                << " * wildcard." << endl;
 
-            if (a.annotated ())
+            if (a.annotated_p ())
             {
               os << " *" << endl;
               write_annotation (a.annotation ());
@@ -2319,7 +2319,7 @@ namespace CXX
                << " * @brief Class corresponding to the %" <<
 	       comment (c.name ()) << " schema type." << endl;
 
-            if (c.annotated ())
+            if (c.annotated_p ())
             {
               os << " *" << endl;
               write_annotation (c.annotation ());
@@ -3122,7 +3122,7 @@ namespace CXX
                << " * @brief Class corresponding to the %" <<
               comment (e.name ()) << " root element." << endl;
 
-            if (e.annotated ())
+            if (e.annotated_p ())
             {
               os << " *" << endl;
               write_annotation (e.annotation ());
-- 
cgit v1.1