Use standard types instead of ones from libcult

33 files changed, 196 insertions, 196 deletions

diff --git a/xsd-frontend/semantic-graph/annotation.hxx b/xsd-frontend/semantic-graph/annotation.hxx
index c6e5dfc..3d6f098 100644
--- a/xsd-frontend/semantic-graph/annotation.hxx
+++ b/xsd-frontend/semantic-graph/annotation.hxx
@@ -28,16 +28,16 @@ namespace XSDFrontend
     public:
       Annotates (): annotation_ (0) {}
 
-      Void
+      void
       set_left_node (Annotation& a)
       {
         annotation_ = &a;
       }
 
-      Void
+      void
       set_right_node (Node&) {}
 
-      Void
+      void
       set_right_node (Edge&) {}
 
     private:
@@ -57,14 +57,14 @@ namespace XSDFrontend
 
     public:
       Annotation (Path const& file,
-                  UnsignedLong line,
-                  UnsignedLong column,
+                  unsigned long line,
+                  unsigned long column,
                   WideString const& documentation)
           : Node (file, line, column), documentation_ (documentation)
       {
       }
 
-      Void
+      void
       add_edge_left (Annotates&) {}
 
     private:
diff --git a/xsd-frontend/semantic-graph/any-attribute.cxx b/xsd-frontend/semantic-graph/any-attribute.cxx
index 3177f80..8a8660c 100644
--- a/xsd-frontend/semantic-graph/any-attribute.cxx
+++ b/xsd-frontend/semantic-graph/any-attribute.cxx
@@ -14,8 +14,8 @@ namespace XSDFrontend
   {
     AnyAttribute::
     AnyAttribute (Path const& file,
-                  UnsignedLong line,
-                  UnsignedLong column,
+                  unsigned long line,
+                  unsigned long column,
                   WideString const& namespaces)
         : Node (file, line, column),
           prototype_ (0)
@@ -24,7 +24,7 @@ namespace XSDFrontend
       // chararcter.
       //
 
-      for (Size i (0), j (namespaces.find (L' '));;)
+      for (size_t i (0), j (namespaces.find (L' '));;)
       {
         if (j != WideString::npos)
         {
@@ -45,8 +45,8 @@ namespace XSDFrontend
 
     AnyAttribute::
     AnyAttribute (Path const& file,
-                  UnsignedLong line,
-                  UnsignedLong column,
+                  unsigned long line,
+                  unsigned long column,
                   NamespaceIterator begin,
                   NamespaceIterator end)
         : Node (file, line, column),
diff --git a/xsd-frontend/semantic-graph/any-attribute.hxx b/xsd-frontend/semantic-graph/any-attribute.hxx
index be06a83..8827987 100644
--- a/xsd-frontend/semantic-graph/any-attribute.hxx
+++ b/xsd-frontend/semantic-graph/any-attribute.hxx
@@ -35,7 +35,7 @@ namespace XSDFrontend
       }
 
     public:
-      Boolean
+      bool
       prototype_p ()
       {
         return prototype_ != 0;
@@ -48,7 +48,7 @@ namespace XSDFrontend
         return *prototype_;
       }
 
-      Void
+      void
       prototype (AnyAttribute& a)
       {
         assert (prototype_ == 0);
@@ -61,13 +61,13 @@ namespace XSDFrontend
 
     public:
       AnyAttribute (Path const& file,
-                    UnsignedLong line,
-                    UnsignedLong column,
+                    unsigned long line,
+                    unsigned long column,
                     WideString const& namespaces);
 
       AnyAttribute (Path const& file,
-                    UnsignedLong line,
-                    UnsignedLong column,
+                    unsigned long line,
+                    unsigned long column,
                     NamespaceIterator begin,
                     NamespaceIterator end);
 
diff --git a/xsd-frontend/semantic-graph/any.cxx b/xsd-frontend/semantic-graph/any.cxx
index 02f4199..75eb5dd 100644
--- a/xsd-frontend/semantic-graph/any.cxx
+++ b/xsd-frontend/semantic-graph/any.cxx
@@ -14,8 +14,8 @@ namespace XSDFrontend
   {
     Any::
     Any (Path const& file,
-         UnsignedLong line,
-         UnsignedLong column,
+         unsigned long line,
+         unsigned long column,
          WideString const& namespaces)
         : Node (file, line, column),
           prototype_ (0)
@@ -24,7 +24,7 @@ namespace XSDFrontend
       // chararcter.
       //
 
-      for (Size i (0), j (namespaces.find (L' '));;)
+      for (size_t i (0), j (namespaces.find (L' '));;)
       {
         if (j != WideString::npos)
         {
@@ -45,8 +45,8 @@ namespace XSDFrontend
 
     Any::
     Any (Path const& file,
-         UnsignedLong line,
-         UnsignedLong column,
+         unsigned long line,
+         unsigned long column,
          NamespaceIterator begin,
          NamespaceIterator end)
         : Node (file, line, column),
diff --git a/xsd-frontend/semantic-graph/any.hxx b/xsd-frontend/semantic-graph/any.hxx
index fce77a4..b0506d0 100644
--- a/xsd-frontend/semantic-graph/any.hxx
+++ b/xsd-frontend/semantic-graph/any.hxx
@@ -37,7 +37,7 @@ namespace XSDFrontend
       }
 
     public:
-      Boolean
+      bool
       prototype_p ()
       {
         return prototype_ != 0;
@@ -50,7 +50,7 @@ namespace XSDFrontend
         return *prototype_;
       }
 
-      Void
+      void
       prototype (Any& a)
       {
         assert (prototype_ == 0);
@@ -63,13 +63,13 @@ namespace XSDFrontend
 
     public:
       Any (Path const& file,
-           UnsignedLong line,
-           UnsignedLong column,
+           unsigned long line,
+           unsigned long column,
            WideString const& namespaces);
 
       Any (Path const& file,
-           UnsignedLong line,
-           UnsignedLong column,
+           unsigned long line,
+           unsigned long column,
            NamespaceIterator begin,
            NamespaceIterator end);
 
diff --git a/xsd-frontend/semantic-graph/attribute-group.cxx b/xsd-frontend/semantic-graph/attribute-group.cxx
index d966cea..71d4046 100644
--- a/xsd-frontend/semantic-graph/attribute-group.cxx
+++ b/xsd-frontend/semantic-graph/attribute-group.cxx
@@ -12,7 +12,7 @@ namespace XSDFrontend
   namespace SemanticGraph
   {
     AttributeGroup::
-    AttributeGroup (Path const& file, UnsignedLong line, UnsignedLong column)
+    AttributeGroup (Path const& file, unsigned long line, unsigned long column)
         : Node (file, line, column)
     {
     }
diff --git a/xsd-frontend/semantic-graph/attribute-group.hxx b/xsd-frontend/semantic-graph/attribute-group.hxx
index a202ae0..003bbd8 100644
--- a/xsd-frontend/semantic-graph/attribute-group.hxx
+++ b/xsd-frontend/semantic-graph/attribute-group.hxx
@@ -16,8 +16,8 @@ namespace XSDFrontend
     {
     public:
       AttributeGroup (Path const& file,
-                      UnsignedLong line,
-                      UnsignedLong column);
+                      unsigned long line,
+                      unsigned long column);
     };
   }
 }
diff --git a/xsd-frontend/semantic-graph/attribute.cxx b/xsd-frontend/semantic-graph/attribute.cxx
index 794832c..f8ff184 100644
--- a/xsd-frontend/semantic-graph/attribute.cxx
+++ b/xsd-frontend/semantic-graph/attribute.cxx
@@ -13,11 +13,11 @@ namespace XSDFrontend
   {
     Attribute::
     Attribute (Path const& file,
-               UnsignedLong line,
-               UnsignedLong column,
-               Boolean optional,
-               Boolean global,
-               Boolean qualified)
+               unsigned long line,
+               unsigned long column,
+               bool optional,
+               bool global,
+               bool qualified)
         : Node (file, line, column),
           Member (global, qualified),
           optional_ (optional)
diff --git a/xsd-frontend/semantic-graph/attribute.hxx b/xsd-frontend/semantic-graph/attribute.hxx
index 49c2019..965589d 100644
--- a/xsd-frontend/semantic-graph/attribute.hxx
+++ b/xsd-frontend/semantic-graph/attribute.hxx
@@ -15,7 +15,7 @@ namespace XSDFrontend
     class Attribute: public virtual Member
     {
     public:
-      Boolean
+      bool
       optional_p () const
       {
         return optional_;
@@ -23,13 +23,13 @@ namespace XSDFrontend
 
     public:
       Attribute (Path const& file,
-                 UnsignedLong line,
-                 UnsignedLong column,
-                 Boolean optional,
-                 Boolean global,
-                 Boolean qualified);
+                 unsigned long line,
+                 unsigned long column,
+                 bool optional,
+                 bool global,
+                 bool qualified);
     private:
-      Boolean optional_;
+      bool optional_;
     };
   }
 }
diff --git a/xsd-frontend/semantic-graph/complex.cxx b/xsd-frontend/semantic-graph/complex.cxx
index f17f12c..3793c07 100644
--- a/xsd-frontend/semantic-graph/complex.cxx
+++ b/xsd-frontend/semantic-graph/complex.cxx
@@ -18,7 +18,7 @@ namespace XSDFrontend
     }
 
     Complex::
-    Complex (Path const& file, UnsignedLong line, UnsignedLong column)
+    Complex (Path const& file, unsigned long line, unsigned long column)
         : Node (file, line, column),
           mixed_ (false), contains_compositor_ (0)
     {
diff --git a/xsd-frontend/semantic-graph/complex.hxx b/xsd-frontend/semantic-graph/complex.hxx
index 106a549..008c5bd 100644
--- a/xsd-frontend/semantic-graph/complex.hxx
+++ b/xsd-frontend/semantic-graph/complex.hxx
@@ -16,14 +16,14 @@ namespace XSDFrontend
     class Complex: public virtual Type, public virtual Scope
     {
     public:
-      Boolean
+      bool
       mixed_p () const
       {
         return mixed_;
       }
 
     public:
-      Boolean
+      bool
       contains_compositor_p ()
       {
         return contains_compositor_ != 0;
@@ -37,22 +37,22 @@ namespace XSDFrontend
       }
 
     public:
-      Void
-      mixed_p (Boolean m)
+      void
+      mixed_p (bool m)
       {
         mixed_ = m;
       }
 
     public:
-      Complex (Path const& file, UnsignedLong line, UnsignedLong column);
+      Complex (Path const& file, unsigned long line, unsigned long column);
 
-      Void
+      void
       add_edge_left (ContainsCompositor& e)
       {
         contains_compositor_ = &e;
       }
 
-      Void
+      void
       remove_edge_left (ContainsCompositor& e)
       {
         assert (contains_compositor_ == &e);
@@ -67,7 +67,7 @@ namespace XSDFrontend
       Complex (); // For virtual inheritance (Enumeration).
 
     private:
-      Boolean mixed_;
+      bool mixed_;
       ContainsCompositor* contains_compositor_;
     };
   }
diff --git a/xsd-frontend/semantic-graph/compositors.cxx b/xsd-frontend/semantic-graph/compositors.cxx
index 8eaa5cf..60ba2aa 100644
--- a/xsd-frontend/semantic-graph/compositors.cxx
+++ b/xsd-frontend/semantic-graph/compositors.cxx
@@ -14,7 +14,7 @@ namespace XSDFrontend
     // ContainsCompositor
     //
     ContainsCompositor::
-    ContainsCompositor (UnsignedLong min, UnsignedLong max)
+    ContainsCompositor (unsigned long min, unsigned long max)
         : compositor_ (0), container_ (0), min_ (min), max_ (max)
     {
     }
@@ -22,7 +22,7 @@ namespace XSDFrontend
     // All
     //
     All::
-    All (Path const& file, UnsignedLong line, UnsignedLong column)
+    All (Path const& file, unsigned long line, unsigned long column)
         : Node (file, line, column)
     {
     }
@@ -30,7 +30,7 @@ namespace XSDFrontend
     // Choice
     //
     Choice::
-    Choice (Path const& file, UnsignedLong line, UnsignedLong column)
+    Choice (Path const& file, unsigned long line, unsigned long column)
         : Node (file, line, column)
     {
     }
@@ -38,7 +38,7 @@ namespace XSDFrontend
     // Sequence
     //
     Sequence::
-    Sequence (Path const& file, UnsignedLong line, UnsignedLong column)
+    Sequence (Path const& file, unsigned long line, unsigned long column)
         : Node (file, line, column)
     {
     }
diff --git a/xsd-frontend/semantic-graph/compositors.hxx b/xsd-frontend/semantic-graph/compositors.hxx
index f7aed8f..78f5352 100644
--- a/xsd-frontend/semantic-graph/compositors.hxx
+++ b/xsd-frontend/semantic-graph/compositors.hxx
@@ -33,41 +33,41 @@ namespace XSDFrontend
       }
 
     public:
-      UnsignedLong
+      unsigned long
       min () const
       {
         return min_;
       }
 
-      UnsignedLong
+      unsigned long
       max () const
       {
         return max_;
       }
 
     public:
-      ContainsCompositor (UnsignedLong min, UnsignedLong max);
+      ContainsCompositor (unsigned long min, unsigned long max);
 
-      Void
+      void
       set_left_node (Node& n)
       {
         container_ = &n;
       }
 
-      Void
+      void
       set_right_node (Compositor& n)
       {
         compositor_ = &n;
       }
 
-      Void
+      void
       clear_left_node (Node& n)
       {
         assert (container_ == &n);
         container_ = 0;
       }
 
-      Void
+      void
       clear_right_node (Compositor& n)
       {
         assert (compositor_ == &n);
@@ -77,7 +77,7 @@ namespace XSDFrontend
     private:
       Compositor* compositor_;
       Node* container_;
-      UnsignedLong min_, max_;
+      unsigned long min_, max_;
     };
 
     //
@@ -117,7 +117,7 @@ namespace XSDFrontend
       }
 
     public:
-      Boolean
+      bool
       contained_compositor_p ()
       {
         return contained_compositor_ != 0;
@@ -131,7 +131,7 @@ namespace XSDFrontend
       }
 
     public:
-      UnsignedLong
+      unsigned long
       min () const
       {
         if (contained_compositor_ != 0)
@@ -140,7 +140,7 @@ namespace XSDFrontend
           return Particle::min ();
       }
 
-      UnsignedLong
+      unsigned long
       max () const
       {
         if (contained_compositor_ != 0)
@@ -152,13 +152,13 @@ namespace XSDFrontend
     public:
       Compositor (): contained_compositor_ (0) {}
 
-      Void
+      void
       add_edge_left (ContainsParticle& e)
       {
         contains_.push_back (&e);
       }
 
-      Void
+      void
       add_edge_left (ContainsParticle& e, ContainsIterator const& after)
       {
         if (after.base () == contains_.end ())
@@ -170,7 +170,7 @@ namespace XSDFrontend
         }
       }
 
-      Void
+      void
       remove_edge_left (ContainsParticle& e)
       {
         for (ContainsList::iterator i (contains_.begin ());
@@ -184,13 +184,13 @@ namespace XSDFrontend
         }
       }
 
-      Void
+      void
       add_edge_right (ContainsCompositor& e)
       {
         contained_compositor_ = &e;
       }
 
-      Void
+      void
       remove_edge_right (ContainsCompositor& e)
       {
         assert (contained_compositor_ == &e);
@@ -211,7 +211,7 @@ namespace XSDFrontend
     class All: public virtual Compositor
     {
     public:
-      All (Path const& file, UnsignedLong line, UnsignedLong column);
+      All (Path const& file, unsigned long line, unsigned long column);
     };
 
     //
@@ -219,7 +219,7 @@ namespace XSDFrontend
     class Choice: public virtual Compositor
     {
     public:
-      Choice (Path const& file, UnsignedLong line, UnsignedLong column);
+      Choice (Path const& file, unsigned long line, unsigned long column);
     };
 
     //
@@ -227,7 +227,7 @@ namespace XSDFrontend
     class Sequence: public virtual Compositor
     {
     public:
-      Sequence (Path const& file, UnsignedLong line, UnsignedLong column);
+      Sequence (Path const& file, unsigned long line, unsigned long column);
     };
   }
 }
diff --git a/xsd-frontend/semantic-graph/element-group.cxx b/xsd-frontend/semantic-graph/element-group.cxx
index 2e42757..01bc604 100644
--- a/xsd-frontend/semantic-graph/element-group.cxx
+++ b/xsd-frontend/semantic-graph/element-group.cxx
@@ -12,7 +12,7 @@ namespace XSDFrontend
   namespace SemanticGraph
   {
     ElementGroup::
-    ElementGroup (Path const& file, UnsignedLong line, UnsignedLong column)
+    ElementGroup (Path const& file, unsigned long line, unsigned long column)
         : Node (file, line, column), contains_compositor_ (0)
     {
     }
diff --git a/xsd-frontend/semantic-graph/element-group.hxx b/xsd-frontend/semantic-graph/element-group.hxx
index 8de3336..34b4803 100644
--- a/xsd-frontend/semantic-graph/element-group.hxx
+++ b/xsd-frontend/semantic-graph/element-group.hxx
@@ -24,9 +24,9 @@ namespace XSDFrontend
       }
 
     public:
-      ElementGroup (Path const& file, UnsignedLong line, UnsignedLong column);
+      ElementGroup (Path const& file, unsigned long line, unsigned long column);
 
-      Void
+      void
       add_edge_left (ContainsCompositor& e)
       {
         contains_compositor_ = &e;
diff --git a/xsd-frontend/semantic-graph/element.cxx b/xsd-frontend/semantic-graph/element.cxx
index 607fd2c..f60bc2e 100644
--- a/xsd-frontend/semantic-graph/element.cxx
+++ b/xsd-frontend/semantic-graph/element.cxx
@@ -15,10 +15,10 @@ namespace XSDFrontend
     //
     Element::
     Element (Path const& file,
-             UnsignedLong line,
-             UnsignedLong column,
-             Boolean global,
-             Boolean qualified)
+             unsigned long line,
+             unsigned long column,
+             bool global,
+             bool qualified)
         : Node (file, line, column),
           Member (global, qualified),
           substitutes_ (0)
diff --git a/xsd-frontend/semantic-graph/element.hxx b/xsd-frontend/semantic-graph/element.hxx
index 425ddce..57a27c6 100644
--- a/xsd-frontend/semantic-graph/element.hxx
+++ b/xsd-frontend/semantic-graph/element.hxx
@@ -31,13 +31,13 @@ namespace XSDFrontend
       }
 
     public:
-      Void
+      void
       set_left_node (Element& n)
       {
         substitution_ = &n;
       }
 
-      Void
+      void
       set_right_node (Element& n)
       {
         root_ = &n;
@@ -53,7 +53,7 @@ namespace XSDFrontend
                    public virtual Particle
     {
     public:
-      Boolean
+      bool
       substitutes_p () const
       {
         return substitutes_ != 0;
@@ -68,18 +68,18 @@ namespace XSDFrontend
 
     public:
       Element (Path const& file,
-               UnsignedLong line,
-               UnsignedLong column,
-               Boolean global,
-               Boolean qualified);
+               unsigned long line,
+               unsigned long column,
+               bool global,
+               bool qualified);
 
-      Void
+      void
       add_edge_left (Substitutes& e)
       {
         substitutes_ = &e;
       }
 
-      Void
+      void
       add_edge_right (Substitutes&) {}
 
       using Member::add_edge_left;
diff --git a/xsd-frontend/semantic-graph/elements.cxx b/xsd-frontend/semantic-graph/elements.cxx
index 4a4e30c..28cfe4d 100644
--- a/xsd-frontend/semantic-graph/elements.cxx
+++ b/xsd-frontend/semantic-graph/elements.cxx
@@ -26,7 +26,7 @@ namespace XSDFrontend
 
     // Type
     //
-    Void Type::
+    void Type::
     remove_edge_left (Arguments& a)
     {
       ArgumentsSet::iterator i (arguments_.find (&a));
@@ -36,7 +36,7 @@ namespace XSDFrontend
 
     // Specialization
     //
-    Void Specialization::
+    void Specialization::
     remove_edge_right (Arguments& a)
     {
       // The number of entries should be small so linear search will do.
diff --git a/xsd-frontend/semantic-graph/elements.hxx b/xsd-frontend/semantic-graph/elements.hxx
index 2b9ce06..ad70221 100644
--- a/xsd-frontend/semantic-graph/elements.hxx
+++ b/xsd-frontend/semantic-graph/elements.hxx
@@ -69,7 +69,7 @@ namespace XSDFrontend
 
     public:
       template <typename X>
-      Boolean
+      bool
       is_a () const
       {
         return dynamic_cast<X const*> (this) != 0;
@@ -79,7 +79,7 @@ namespace XSDFrontend
       mutable Context context_;
     };
 
-    inline Boolean
+    inline bool
     operator== (Edge const& x, Edge const& y)
     {
       return &x == &y;
@@ -104,20 +104,20 @@ namespace XSDFrontend
         return file_;
       }
 
-      UnsignedLong
+      unsigned long
       line () const
       {
         return line_;
       }
 
-      UnsignedLong
+      unsigned long
       column () const
       {
         return column_;
       }
 
     public:
-      Boolean
+      bool
       annotated_p () const
       {
         return annotates_ != 0;
@@ -134,7 +134,7 @@ namespace XSDFrontend
 
     public:
       template <typename X>
-      Boolean
+      bool
       is_a () const
       {
         return dynamic_cast<X const*> (this) != 0;
@@ -144,12 +144,12 @@ namespace XSDFrontend
       virtual
       ~Node () {}
 
-      Node (Path const& file, UnsignedLong line, UnsignedLong column)
+      Node (Path const& file, unsigned long line, unsigned long column)
           : annotates_ (0), file_ (file), line_ (line), column_ (column)
       {
       }
 
-      Void
+      void
       add_edge_right (Annotates& a)
       {
         annotates_ = &a;
@@ -165,11 +165,11 @@ namespace XSDFrontend
       mutable Context context_;
       Annotates* annotates_;
       Path file_;
-      UnsignedLong line_;
-      UnsignedLong column_;
+      unsigned long line_;
+      unsigned long column_;
     };
 
-    inline Boolean
+    inline bool
     operator== (Node const& x, Node const& y)
     {
       return &x == &y;
@@ -216,26 +216,26 @@ namespace XSDFrontend
     public:
       Names (Name const& name): name_ (name) {}
 
-      Void
+      void
       set_left_node (Scope& n)
       {
         scope_ = &n;
       }
 
-      Void
+      void
       set_right_node (Nameable& n)
       {
         named_ = &n;
       }
 
-      Void
+      void
       clear_left_node (Scope& n)
       {
         assert (scope_ == &n);
         scope_ = 0;
       }
 
-      Void
+      void
       clear_right_node (Nameable& n)
       {
         assert (named_ == &n);
@@ -252,7 +252,7 @@ namespace XSDFrontend
     class Nameable: public virtual Node
     {
     public:
-      Boolean
+      bool
       named_p () const
       {
         return named_ != 0;
@@ -282,13 +282,13 @@ namespace XSDFrontend
     public:
       Nameable (): named_ (0) {}
 
-      Void
+      void
       add_edge_right (Names& e)
       {
         named_ = &e;
       }
 
-      Void
+      void
       remove_edge_right (Names& e)
       {
         assert (named_ == &e);
@@ -365,12 +365,12 @@ namespace XSDFrontend
       }
 
     public:
-      Scope (Path const& file, UnsignedLong line, UnsignedLong column)
+      Scope (Path const& file, unsigned long line, unsigned long column)
           : Node (file, line, column)
       {
       }
 
-      Void
+      void
       add_edge_left (Names& e)
       {
         NamesList::iterator i (names_.insert (names_.end (), &e));
@@ -378,7 +378,7 @@ namespace XSDFrontend
         names_map_[e.name ()].push_back (&e);
       }
 
-      Void
+      void
       remove_edge_left (Names& e)
       {
         ListIteratorMap::iterator i (iterator_map_.find (&e));
@@ -397,7 +397,7 @@ namespace XSDFrontend
         }
       }
 
-      Void
+      void
       add_edge_left (Names& e, NamesIterator const& after)
       {
         NamesList::iterator i;
@@ -456,7 +456,7 @@ namespace XSDFrontend
 
       //
       //
-      Boolean
+      bool
       inherits_p () const
       {
         return inherits_ != 0;
@@ -504,13 +504,13 @@ namespace XSDFrontend
     public:
       Type (): inherits_ (0) {}
 
-      Void
+      void
       add_edge_right (Belongs& e)
       {
         classifies_.push_back (&e);
       }
 
-      Void
+      void
       add_edge_right (Inherits& e)
       {
         begets_.push_back (&e);
@@ -518,16 +518,16 @@ namespace XSDFrontend
 
       using Nameable::add_edge_right;
 
-      Void
+      void
       add_edge_left (Arguments& a)
       {
         arguments_.insert (&a);
       }
 
-      Void
+      void
       remove_edge_left (Arguments&);
 
-      Void
+      void
       add_edge_left (Inherits& e)
       {
         inherits_ = &e;
@@ -552,7 +552,7 @@ namespace XSDFrontend
       Type&
       type () const;
 
-      Boolean
+      bool
       typed_p () const
       {
         return belongs_ != 0;
@@ -561,7 +561,7 @@ namespace XSDFrontend
     public:
       Instance (): belongs_ (0) {}
 
-      Void
+      void
       add_edge_left (Belongs& e)
       {
         belongs_ = &e;
@@ -588,13 +588,13 @@ namespace XSDFrontend
       }
 
     public:
-      Void
+      void
       set_left_node (Instance& n)
       {
         instance_ = &n;
       }
 
-      Void
+      void
       set_right_node (Type& n)
       {
         type_ = &n;
@@ -624,13 +624,13 @@ namespace XSDFrontend
       }
 
     public:
-      Void
+      void
       set_left_node (Type& n)
       {
         derived_ = &n;
       }
 
-      Void
+      void
       set_right_node (Type& n)
       {
         base_ = &n;
@@ -651,7 +651,7 @@ namespace XSDFrontend
       typedef std::map<WideString, WideString> Facets;
       typedef Facets::iterator FacetIterator;
 
-      Boolean
+      bool
       facet_empty ()
       {
         return facets_.empty ();
@@ -675,7 +675,7 @@ namespace XSDFrontend
         return facets_.find (name);
       }
 
-      Void
+      void
       facet_insert (String const& name, String const& value)
       {
         facets_[name] = value;
@@ -717,13 +717,13 @@ namespace XSDFrontend
     public:
       BelongsToNamespace (): member_ (0), namespace__ (0) {}
 
-      Void
+      void
       set_left_node (Member& n)
       {
         member_ = &n;
       }
 
-      Void
+      void
       set_right_node (Namespace& n)
       {
         namespace__ = &n;
@@ -742,13 +742,13 @@ namespace XSDFrontend
       // Member is global either if it is defined outside any type
       // or it is a ref="" of a global member.
       //
-      Boolean
+      bool
       global_p () const
       {
         return global_;
       }
 
-      Boolean
+      bool
       qualified_p () const
       {
         return qualified_;
@@ -768,13 +768,13 @@ namespace XSDFrontend
       // is a superset of the default value semantics. As such setting the
       // fixed value appears as if the default value was also set.
       //
-      Boolean
+      bool
       default_p () const
       {
         return value_type_ != ValueType::none;
       }
 
-      Boolean
+      bool
       fixed_p () const
       {
         return value_type_ == ValueType::fixed;
@@ -793,14 +793,14 @@ namespace XSDFrontend
 
       //
       //
-      Void
+      void
       default_ (WideString const& v)
       {
         value_ = v;
         value_type_ = ValueType::default_;
       }
 
-      Void
+      void
       fixed (WideString const& v)
       {
         value_ = v;
@@ -808,7 +808,7 @@ namespace XSDFrontend
       }
 
     public:
-      Member (Boolean global, Boolean qualified)
+      Member (bool global, bool qualified)
           : global_ (global),
             qualified_ (qualified),
             belongs_to_namespace_ (0),
@@ -816,7 +816,7 @@ namespace XSDFrontend
       {
       }
 
-      Void
+      void
       add_edge_left (BelongsToNamespace& e)
       {
         // In the parser we sometimes re-add the same adge.
@@ -827,8 +827,8 @@ namespace XSDFrontend
       using Instance::add_edge_left;
 
     private:
-      Boolean global_;
-      Boolean qualified_;
+      bool global_;
+      bool qualified_;
       BelongsToNamespace* belongs_to_namespace_;
 
       struct ValueType
@@ -894,19 +894,19 @@ namespace XSDFrontend
     public:
       using Type::add_edge_right;
 
-      Void
+      void
       add_edge_right (Arguments& a)
       {
         argumented_.push_back (&a);
       }
 
-      Void
+      void
       add_edge_right (Arguments& a, ArgumentedIterator const& pos)
       {
         argumented_.insert (pos.base (), &a);
       }
 
-      Void
+      void
       remove_edge_right (Arguments&);
 
     private:
@@ -966,7 +966,7 @@ namespace XSDFrontend
     class AnyType: public virtual Type
     {
     public:
-      AnyType (Path const& file, UnsignedLong line, UnsignedLong column)
+      AnyType (Path const& file, unsigned long line, unsigned long column)
           : Node (file, line, column)
       {
       }
@@ -981,7 +981,7 @@ namespace XSDFrontend
     class AnySimpleType: public virtual Type
     {
     public:
-      AnySimpleType (Path const& file, UnsignedLong line, UnsignedLong column)
+      AnySimpleType (Path const& file, unsigned long line, unsigned long column)
           : Node (file, line, column)
       {
       }
diff --git a/xsd-frontend/semantic-graph/enumeration.cxx b/xsd-frontend/semantic-graph/enumeration.cxx
index adb9704..5be646f 100644
--- a/xsd-frontend/semantic-graph/enumeration.cxx
+++ b/xsd-frontend/semantic-graph/enumeration.cxx
@@ -14,7 +14,7 @@ namespace XSDFrontend
     // Enumeration
     //
     Enumeration::
-    Enumeration (Path const& file, UnsignedLong line, UnsignedLong column)
+    Enumeration (Path const& file, unsigned long line, unsigned long column)
         : Node (file, line, column)
     {
     }
@@ -22,7 +22,7 @@ namespace XSDFrontend
     // Enumerator
     //
     Enumerator::
-    Enumerator (Path const& file, UnsignedLong line, UnsignedLong column)
+    Enumerator (Path const& file, unsigned long line, unsigned long column)
         : Node (file, line, column)
     {
     }
diff --git a/xsd-frontend/semantic-graph/enumeration.hxx b/xsd-frontend/semantic-graph/enumeration.hxx
index ca00c07..d9a956b 100644
--- a/xsd-frontend/semantic-graph/enumeration.hxx
+++ b/xsd-frontend/semantic-graph/enumeration.hxx
@@ -16,14 +16,14 @@ namespace XSDFrontend
     class Enumeration: public virtual Complex
     {
     public:
-      Enumeration (Path const& file, UnsignedLong line, UnsignedLong column);
+      Enumeration (Path const& file, unsigned long line, unsigned long column);
     };
 
 
     class Enumerator: public virtual Instance
     {
     public:
-      Enumerator (Path const& file, UnsignedLong line, UnsignedLong column);
+      Enumerator (Path const& file, unsigned long line, unsigned long column);
     };
   }
 }
diff --git a/xsd-frontend/semantic-graph/fundamental.cxx.m4 b/xsd-frontend/semantic-graph/fundamental.cxx.m4
index cf6c17f..7148623 100644
--- a/xsd-frontend/semantic-graph/fundamental.cxx.m4
+++ b/xsd-frontend/semantic-graph/fundamental.cxx.m4
@@ -31,8 +31,8 @@ define(`fundamental_type_impl', `
 
       $1::
       $1 (Path const& file,
-          SemanticGraph::UnsignedLong line,
-          SemanticGraph::UnsignedLong column)
+          unsigned long line,
+          unsigned long column)
         : Node (file, line, column)
       {
       }')
@@ -146,8 +146,8 @@ fundamental_type(`id')
 
       IdRef::
       IdRef (Path const& file,
-             SemanticGraph::UnsignedLong line,
-             SemanticGraph::UnsignedLong column)
+             unsigned long line,
+             unsigned long column)
           : Node (file, line, column)
       {
       }
@@ -172,8 +172,8 @@ fundamental_type(`id')
 
       IdRefs::
       IdRefs (Path const& file,
-              SemanticGraph::UnsignedLong line,
-              SemanticGraph::UnsignedLong column)
+              unsigned long line,
+              unsigned long column)
           : Node (file, line, column)
       {
       }
diff --git a/xsd-frontend/semantic-graph/fundamental.hxx.m4 b/xsd-frontend/semantic-graph/fundamental.hxx.m4
index 2474822..7167bc9 100644
--- a/xsd-frontend/semantic-graph/fundamental.hxx.m4
+++ b/xsd-frontend/semantic-graph/fundamental.hxx.m4
@@ -17,8 +17,8 @@ define(`fundamental_type_impl', `
       {
       public:
         $1 (Path const& file,
-            SemanticGraph::UnsignedLong line,
-            SemanticGraph::UnsignedLong column);
+            unsigned long line,
+            unsigned long column);
       };')
 divert(0)dnl
 dnl
@@ -104,8 +104,8 @@ fundamental_type(`id')
       {
       public:
         IdRef (Path const& file,
-               SemanticGraph::UnsignedLong line,
-               SemanticGraph::UnsignedLong column);
+               unsigned long line,
+               unsigned long column);
       };
 
 
@@ -116,8 +116,8 @@ fundamental_type(`id')
       {
       public:
         IdRefs (Path const& file,
-                SemanticGraph::UnsignedLong line,
-                SemanticGraph::UnsignedLong column);
+                unsigned long line,
+                unsigned long column);
       };
 dnl
 dnl URI.
diff --git a/xsd-frontend/semantic-graph/list.cxx b/xsd-frontend/semantic-graph/list.cxx
index 9911b81..bc66f04 100644
--- a/xsd-frontend/semantic-graph/list.cxx
+++ b/xsd-frontend/semantic-graph/list.cxx
@@ -12,7 +12,7 @@ namespace XSDFrontend
   namespace SemanticGraph
   {
     List::
-    List (Path const& file, UnsignedLong line, UnsignedLong column)
+    List (Path const& file, unsigned long line, unsigned long column)
         : Node (file, line, column)
     {
     }
diff --git a/xsd-frontend/semantic-graph/list.hxx b/xsd-frontend/semantic-graph/list.hxx
index d9f11d0..2ad375c 100644
--- a/xsd-frontend/semantic-graph/list.hxx
+++ b/xsd-frontend/semantic-graph/list.hxx
@@ -15,7 +15,7 @@ namespace XSDFrontend
     class List: public virtual Specialization
     {
     public:
-      List (Path const& file, UnsignedLong line, UnsignedLong column);
+      List (Path const& file, unsigned long line, unsigned long column);
     };
   }
 }
diff --git a/xsd-frontend/semantic-graph/namespace.cxx b/xsd-frontend/semantic-graph/namespace.cxx
index a82d1e1..d25638e 100644
--- a/xsd-frontend/semantic-graph/namespace.cxx
+++ b/xsd-frontend/semantic-graph/namespace.cxx
@@ -12,7 +12,7 @@ namespace XSDFrontend
   namespace SemanticGraph
   {
     Namespace::
-    Namespace (Path const& file, UnsignedLong line, UnsignedLong column)
+    Namespace (Path const& file, unsigned long line, unsigned long column)
         : Node (file, line, column)
     {
     }
diff --git a/xsd-frontend/semantic-graph/namespace.hxx b/xsd-frontend/semantic-graph/namespace.hxx
index 7a2e1eb..cd20631 100644
--- a/xsd-frontend/semantic-graph/namespace.hxx
+++ b/xsd-frontend/semantic-graph/namespace.hxx
@@ -15,9 +15,9 @@ namespace XSDFrontend
     class Namespace : public virtual Scope
     {
     public:
-      Namespace (Path const& file, UnsignedLong line, UnsignedLong column);
+      Namespace (Path const& file, unsigned long line, unsigned long column);
 
-      Void
+      void
       add_edge_right (BelongsToNamespace&) {}
 
       using Scope::add_edge_right;
diff --git a/xsd-frontend/semantic-graph/particle.cxx b/xsd-frontend/semantic-graph/particle.cxx
index b966086..88e008b 100644
--- a/xsd-frontend/semantic-graph/particle.cxx
+++ b/xsd-frontend/semantic-graph/particle.cxx
@@ -14,7 +14,7 @@ namespace XSDFrontend
     // ContainsParticle
     //
     ContainsParticle::
-    ContainsParticle (UnsignedLong min, UnsignedLong max)
+    ContainsParticle (unsigned long min, unsigned long max)
         : particle_ (0), compositor_ (0), min_ (min), max_ (max)
     {
     }
diff --git a/xsd-frontend/semantic-graph/particle.hxx b/xsd-frontend/semantic-graph/particle.hxx
index e66a1ad..50f5f9f 100644
--- a/xsd-frontend/semantic-graph/particle.hxx
+++ b/xsd-frontend/semantic-graph/particle.hxx
@@ -36,41 +36,41 @@ namespace XSDFrontend
       }
 
     public:
-      UnsignedLong
+      unsigned long
       min () const
       {
         return min_;
       }
 
-      UnsignedLong
+      unsigned long
       max () const
       {
         return max_;
       }
 
     public:
-      ContainsParticle (UnsignedLong min, UnsignedLong max);
+      ContainsParticle (unsigned long min, unsigned long max);
 
-      Void
+      void
       set_left_node (Compositor& n)
       {
         compositor_ = &n;
       }
 
-      Void
+      void
       set_right_node (Particle& n)
       {
         particle_ = &n;
       }
 
-      Void
+      void
       clear_left_node (Compositor& n)
       {
         assert (compositor_ == &n);
         compositor_ = 0;
       }
 
-      Void
+      void
       clear_right_node (Particle& n)
       {
         assert (particle_ == &n);
@@ -80,7 +80,7 @@ namespace XSDFrontend
     private:
       Particle* particle_;
       Compositor* compositor_;
-      UnsignedLong min_, max_;
+      unsigned long min_, max_;
     };
 
     //
@@ -88,7 +88,7 @@ namespace XSDFrontend
     class Particle: public virtual Node
     {
     public:
-      Boolean
+      bool
       contained_particle_p ()
       {
         return contained_particle_ != 0;
@@ -102,14 +102,14 @@ namespace XSDFrontend
       }
 
     public:
-      UnsignedLong
+      unsigned long
       min () const
       {
         assert (contained_particle_ != 0);
         return contained_particle_->min ();
       }
 
-      UnsignedLong
+      unsigned long
       max () const
       {
         assert (contained_particle_ != 0);
@@ -119,13 +119,13 @@ namespace XSDFrontend
     public:
       Particle ();
 
-      Void
+      void
       add_edge_right (ContainsParticle& e)
       {
         contained_particle_ = &e;
       }
 
-      Void
+      void
       remove_edge_right (ContainsParticle& e)
       {
         assert (contained_particle_ == &e);
diff --git a/xsd-frontend/semantic-graph/schema.cxx b/xsd-frontend/semantic-graph/schema.cxx
index 3ff8c6d..ec990de 100644
--- a/xsd-frontend/semantic-graph/schema.cxx
+++ b/xsd-frontend/semantic-graph/schema.cxx
@@ -27,7 +27,7 @@ namespace XSDFrontend
                                 NamesConstIterator (names_.end ()));
     }
 
-    Void Schema::
+    void Schema::
     find_ (Name const& name, NamesList& names, SchemaSet& set) const
     {
       set.insert (this);
diff --git a/xsd-frontend/semantic-graph/schema.hxx b/xsd-frontend/semantic-graph/schema.hxx
index 1150047..09a6490 100644
--- a/xsd-frontend/semantic-graph/schema.hxx
+++ b/xsd-frontend/semantic-graph/schema.hxx
@@ -42,13 +42,13 @@ namespace XSDFrontend
     public:
       Uses (Path const& path): path_ (path) {}
 
-      Void
+      void
       set_left_node (Schema& s)
       {
         user_ = &s;
       }
 
-      Void
+      void
       set_right_node (Schema& s)
       {
         schema_ = &s;
@@ -104,7 +104,7 @@ namespace XSDFrontend
       typedef std::vector<Uses*> UsedList;
 
     public:
-      Schema (Path const& file, UnsignedLong line, UnsignedLong column)
+      Schema (Path const& file, unsigned long line, unsigned long column)
           : Node (file, line, column), graph_ (*this)
       {
       }
@@ -143,7 +143,7 @@ namespace XSDFrontend
         return used_.end ();
       }
 
-      Boolean
+      bool
       used_p () const
       {
         return used_begin () != used_end ();
@@ -163,14 +163,14 @@ namespace XSDFrontend
 
       template <typename T>
       T&
-      new_node (Path const& file, UnsignedLong line, UnsignedLong column)
+      new_node (Path const& file, unsigned long line, unsigned long column)
       {
         return graph_.new_node<T> (file, line, column);
       }
 
       template <typename T, typename A0>
       T&
-      new_node (Path const& file, UnsignedLong line, UnsignedLong column,
+      new_node (Path const& file, unsigned long line, unsigned long column,
                 A0 const& a0)
       {
         return graph_.new_node<T> (file, line, column, a0);
@@ -178,7 +178,7 @@ namespace XSDFrontend
 
       template <typename T, typename A0, typename A1>
       T&
-      new_node (Path const& file, UnsignedLong line, UnsignedLong column,
+      new_node (Path const& file, unsigned long line, unsigned long column,
                 A0 const& a0, A1 const& a1)
       {
         return graph_.new_node<T> (file, line, column, a0, a1);
@@ -186,7 +186,7 @@ namespace XSDFrontend
 
       template <typename T, typename A0, typename A1, typename A2>
       T&
-      new_node (Path const& file, UnsignedLong line, UnsignedLong column,
+      new_node (Path const& file, unsigned long line, unsigned long column,
                 A0 const& a0, A1 const& a1, A2 const& a2)
       {
         return graph_.new_node<T> (file, line, column, a0, a1, a2);
@@ -195,7 +195,7 @@ namespace XSDFrontend
       template <typename T, typename A0, typename A1, typename A2,
                 typename A3>
       T&
-      new_node (Path const& file, UnsignedLong line, UnsignedLong column,
+      new_node (Path const& file, unsigned long line, unsigned long column,
                 A0 const& a0, A1 const& a1, A2 const& a2, A3 const& a3)
       {
         return graph_.new_node<T> (file, line, column, a0, a1, a2, a3);
@@ -205,13 +205,13 @@ namespace XSDFrontend
       using Scope::add_edge_left;
       using Node::add_edge_right;
 
-      Void
+      void
       add_edge_left (Uses& e)
       {
         uses_.push_back (&e);
       }
 
-      Void
+      void
       add_edge_right (Uses& e)
       {
         used_.push_back (&e);
@@ -220,7 +220,7 @@ namespace XSDFrontend
     private:
       typedef std::set<Schema const*> SchemaSet;
 
-      Void
+      void
       find_ (Name const& name, NamesList&, SchemaSet&) const;
 
     private:
diff --git a/xsd-frontend/semantic-graph/union.cxx b/xsd-frontend/semantic-graph/union.cxx
index 111dd13..90053c4 100644
--- a/xsd-frontend/semantic-graph/union.cxx
+++ b/xsd-frontend/semantic-graph/union.cxx
@@ -12,7 +12,7 @@ namespace XSDFrontend
   namespace SemanticGraph
   {
     Union::
-    Union (Path const& file, UnsignedLong line, UnsignedLong column)
+    Union (Path const& file, unsigned long line, unsigned long column)
         : Node (file, line, column)
     {
     }
diff --git a/xsd-frontend/semantic-graph/union.hxx b/xsd-frontend/semantic-graph/union.hxx
index b3a130f..0436098 100644
--- a/xsd-frontend/semantic-graph/union.hxx
+++ b/xsd-frontend/semantic-graph/union.hxx
@@ -15,7 +15,7 @@ namespace XSDFrontend
     class Union: public virtual Specialization
     {
     public:
-      Union (Path const& file, UnsignedLong line, UnsignedLong column);
+      Union (Path const& file, unsigned long line, unsigned long column);
     };
   }
 }