1 files changed, 20 insertions, 20 deletions

diff --git a/xsde/cxx/hybrid/insertion-source.cxx b/xsde/cxx/hybrid/insertion-source.cxx
index d579964..4002384 100644
--- a/xsde/cxx/hybrid/insertion-source.cxx
+++ b/xsde/cxx/hybrid/insertion-source.cxx
@@ -21,7 +21,7 @@ namespace CXX
         {
         }
 
-        virtual Void
+        virtual void
         traverse (Type& e)
         {
           // First see if we should delegate this one to the Complex
@@ -66,7 +66,7 @@ namespace CXX
         {
         }
 
-        virtual Void
+        virtual void
         traverse (Type& l)
         {
           String const& name (ename_custom (l));
@@ -105,7 +105,7 @@ namespace CXX
         {
         }
 
-        virtual Void
+        virtual void
         traverse (Type& u)
         {
           String const& name (ename_custom (u));
@@ -142,7 +142,7 @@ namespace CXX
         {
         }
 
-        virtual Void
+        virtual void
         traverse (SemanticGraph::Attribute& a)
         {
           // Don't waste space on fixed attributes.
@@ -203,7 +203,7 @@ namespace CXX
         {
         }
 
-        virtual Void
+        virtual void
         traverse (SemanticGraph::Element& e)
         {
           if (e.max () == 1 && e.min () == 0)
@@ -241,7 +241,7 @@ namespace CXX
         {
         }
 
-        virtual Void
+        virtual void
         traverse (SemanticGraph::All& a)
         {
           // For the all compositor, maxOccurs=1 and minOccurs={0,1}
@@ -283,7 +283,7 @@ namespace CXX
         {
         }
 
-        virtual Void
+        virtual void
         traverse (SemanticGraph::Element& e)
         {
           os << "case " << scope (e) << "::" << etag (e) << ":"
@@ -295,7 +295,7 @@ namespace CXX
              << "}";
         }
 
-        virtual Void
+        virtual void
         traverse (SemanticGraph::Compositor& c)
         {
           os << "case " << scope (c) << "::" << etag (c) << ":"
@@ -342,7 +342,7 @@ namespace CXX
           contains_data_ >> particle_data_;
         }
 
-        virtual Void
+        virtual void
         traverse (SemanticGraph::Choice& c)
         {
           if (c.max () != 1)
@@ -412,7 +412,7 @@ namespace CXX
         {
         }
 
-        virtual Void
+        virtual void
         traverse (SemanticGraph::Sequence& s)
         {
           if (s.max () != 1)
@@ -464,7 +464,7 @@ namespace CXX
         {
         }
 
-        virtual Void
+        virtual void
         traverse (SemanticGraph::All& a)
         {
           // For the all compositor, maxOccurs=1 and minOccurs={0,1}
@@ -500,13 +500,13 @@ namespace CXX
 
       struct Choice: Traversal::Choice, Context
       {
-        Choice (Context& c, Boolean in_choice)
+        Choice (Context& c, bool in_choice)
             : Context (c), in_choice_ (in_choice), particle_data_ (c)
         {
           contains_data_ >> particle_data_;
         }
 
-        virtual Void
+        virtual void
         traverse (SemanticGraph::Choice& c)
         {
           // When choice is in choice we generate nested class even
@@ -552,7 +552,7 @@ namespace CXX
         }
 
       private:
-        Boolean in_choice_;
+        bool in_choice_;
 
         ChoiceParticleData particle_data_;
         Traversal::ContainsParticle contains_data_;
@@ -562,7 +562,7 @@ namespace CXX
       struct Sequence: Traversal::Sequence, Context
       {
         Sequence (Context& c,
-                  Boolean in_choice,
+                  bool in_choice,
                   Traversal::ContainsParticle& contains_data)
             : Context (c),
               in_choice_ (in_choice),
@@ -570,7 +570,7 @@ namespace CXX
         {
         }
 
-        virtual Void
+        virtual void
         traverse (SemanticGraph::Sequence& s)
         {
           // When sequence is in choice we generate nested class even
@@ -603,7 +603,7 @@ namespace CXX
         }
 
       private:
-        Boolean in_choice_;
+        bool in_choice_;
         Traversal::ContainsParticle& contains_data_;
       };
 
@@ -667,7 +667,7 @@ namespace CXX
           contains_compositor_ >> sequence_in_sequence_;
         }
 
-        virtual Void
+        virtual void
         traverse (Type& c)
         {
           String const& name (ename_custom (c));
@@ -678,7 +678,7 @@ namespace CXX
           if (!name)
             return;
 
-          Boolean restriction (restriction_p (c));
+          bool restriction (restriction_p (c));
 
           for (NarrowStrings::const_iterator i (ostreams.begin ());
                i != ostreams.end (); ++i)
@@ -754,7 +754,7 @@ namespace CXX
       };
     }
 
-    Void
+    void
     generate_insertion_source (Context& ctx)
     {
       Traversal::Schema schema;