1 files changed, 36 insertions, 36 deletions

diff --git a/xsde/cxx/serializer/serializer-inline.cxx b/xsde/cxx/serializer/serializer-inline.cxx
index 9ef7fc0..47feafc 100644
--- a/xsde/cxx/serializer/serializer-inline.cxx
+++ b/xsde/cxx/serializer/serializer-inline.cxx
@@ -14,7 +14,7 @@ namespace CXX
   {
     namespace
     {
-      Void
+      void
       facet_calls (SemanticGraph::Complex& c, Context& ctx)
       {
         using SemanticGraph::Restricts;
@@ -108,19 +108,19 @@ namespace CXX
         {
         }
 
-        virtual Void
+        virtual void
         traverse (Type& e)
         {
           String const& name (ename (e));
 
-          Boolean enum_facets (false); // Whether we need to set enum facets.
+          bool enum_facets (false); // Whether we need to set enum facets.
           if (validation)
           {
             StringBasedType t (enum_facets);
             t.dispatch (e);
           }
 
-          UnsignedLong enum_count (0);
+          size_t enum_count (0);
           if (enum_facets)
           {
             for (Type::NamesIterator i (e.names_begin ()), end (e.names_end ());
@@ -128,7 +128,7 @@ namespace CXX
               ++enum_count;
           }
 
-          Boolean facets (enum_facets || has_facets (e));
+          bool facets (enum_facets || has_facets (e));
 
           if (facets || tiein)
             os << "// " << name << endl
@@ -182,8 +182,8 @@ namespace CXX
         }
 
       private:
-        Void
-        facet_calls (Type& e, UnsignedLong enum_count)
+        void
+        facet_calls (Type& e, size_t enum_count)
         {
           Serializer::facet_calls (e, *this);
 
@@ -203,7 +203,7 @@ namespace CXX
         {
         }
 
-        virtual Void
+        virtual void
         traverse (Type& l)
         {
           String const& name (ename (l));
@@ -271,7 +271,7 @@ namespace CXX
         {
         }
 
-        virtual Void
+        virtual void
         traverse (Type& u)
         {
           if (tiein)
@@ -314,7 +314,7 @@ namespace CXX
         {
         }
 
-        virtual Void
+        virtual void
         traverse (SemanticGraph::Element& e)
         {
           String const& scope (ename (e.scope ()));
@@ -346,7 +346,7 @@ namespace CXX
         {
         }
 
-        virtual Void
+        virtual void
         traverse (Type& a)
         {
           String const& name (ename (a));
@@ -365,12 +365,12 @@ namespace CXX
       //
       struct ParticleMemberSet: Traversal::Element, Context
       {
-        ParticleMemberSet (Context& c, Boolean poly)
+        ParticleMemberSet (Context& c, bool poly)
             : Context (c), poly_ (poly)
         {
         }
 
-        virtual Void
+        virtual void
         traverse (SemanticGraph::Element& e)
         {
           if (poly_)
@@ -383,7 +383,7 @@ namespace CXX
         }
 
       private:
-        Boolean poly_;
+        bool poly_;
       };
 
       struct AttributeMemberSet: Traversal::Attribute, Context
@@ -393,7 +393,7 @@ namespace CXX
         {
         }
 
-        virtual Void
+        virtual void
         traverse (Type& a)
         {
           os << "this->" << emember (a) << " = &" << ename (a) << ";";
@@ -404,13 +404,13 @@ namespace CXX
                             Traversal::List,
                             Context
       {
-        BaseMemberSet (Context& c, Boolean poly)
+        BaseMemberSet (Context& c, bool poly)
             : Context (c), poly_ (poly)
         {
           inherits_ >> *this;
         }
 
-        virtual Void
+        virtual void
         traverse (SemanticGraph::Complex& c)
         {
           inherits (c, inherits_);
@@ -422,7 +422,7 @@ namespace CXX
           }
         }
 
-        virtual Void
+        virtual void
         traverse (SemanticGraph::List& l)
         {
           if (poly_)
@@ -436,19 +436,19 @@ namespace CXX
 
       private:
         Traversal::Inherits inherits_;
-        Boolean poly_;
+        bool poly_;
       };
 
       //
       //
       struct ParticleMemberInit: Traversal::Element, Context
       {
-        ParticleMemberInit (Context& c, Boolean comma)
+        ParticleMemberInit (Context& c, bool comma)
             : Context (c), first_ (!comma)
         {
         }
 
-        virtual Void
+        virtual void
         traverse (SemanticGraph::Element& e)
         {
           if (first_)
@@ -466,17 +466,17 @@ namespace CXX
         }
 
       private:
-        Boolean first_;
+        bool first_;
       };
 
       struct AttributeMemberInit: Traversal::Attribute, Context
       {
-        AttributeMemberInit (Context& c, Boolean comma)
+        AttributeMemberInit (Context& c, bool comma)
             : Context (c), first_ (!comma)
         {
         }
 
-        virtual Void
+        virtual void
         traverse (Type& a)
         {
           if (first_)
@@ -487,14 +487,14 @@ namespace CXX
           os << emember (a) << " (0)";
         }
 
-        Boolean
+        bool
         comma () const
         {
           return !first_;
         }
 
       private:
-        Boolean first_;
+        bool first_;
       };
 
 
@@ -545,14 +545,14 @@ namespace CXX
           contains_particle_set_poly_ >> particle_set_poly_;
         }
 
-        virtual Void
+        virtual void
         traverse (Type& c)
         {
-          Boolean hb (c.inherits_p ());
-          Boolean he (has<Traversal::Element> (c));
-          Boolean ha (has<Traversal::Attribute> (c));
-          Boolean restriction (restriction_p (c));
-          Boolean facets (has_facets (c));
+          bool hb (c.inherits_p ());
+          bool he (has<Traversal::Element> (c));
+          bool ha (has<Traversal::Attribute> (c));
+          bool restriction (restriction_p (c));
+          bool facets (has_facets (c));
 
           if (!(tiein || facets || (!restriction && (he || ha))))
             return;
@@ -601,7 +601,7 @@ namespace CXX
             //
             if (poly_code && he)
             {
-              Boolean r (false);
+              bool r (false);
               SerializerParamTest test (*this, r, true);
               test.traverse (c);
 
@@ -647,7 +647,7 @@ namespace CXX
           if (tiein || (!restriction && (he || ha)))
             os << ": ";
 
-          Boolean comma (false);
+          bool comma (false);
 
           if (hb && tiein)
           {
@@ -717,7 +717,7 @@ namespace CXX
 
             os << "  " << etiein (c) << " (impl)";
 
-            Boolean comma (true);
+            bool comma (true);
 
             if (!restriction && (he || ha))
             {
@@ -794,7 +794,7 @@ namespace CXX
       };
     }
 
-    Void
+    void
     generate_serializer_inline (Context& ctx)
     {
       // Emit "weak" header includes that are used in the file-per-type