Get rid of dependency on libcult

1 files changed, 6 insertions, 13 deletions

diff --git a/xsde/cxx/parser/generator.hxx b/xsde/cxx/parser/generator.hxx
index c2a0177..5cfed0a 100644
--- a/xsde/cxx/parser/generator.hxx
+++ b/xsde/cxx/parser/generator.hxx
@@ -6,34 +6,27 @@
 #ifndef CXX_PARSER_GENERATOR_HXX
 #define CXX_PARSER_GENERATOR_HXX
 
-#include <cult/types.hxx>
-
-#include <cult/containers/vector.hxx>
-
 #include <xsd-frontend/semantic-graph/elements.hxx> // Path
 #include <xsd-frontend/semantic-graph/schema.hxx>
 
 #include <xsde.hxx>
-
+#include <types.hxx>
 #include <type-map/type-map.hxx>
-
 #include <cxx/parser/options.hxx>
 
 namespace CXX
 {
   namespace Parser
   {
-    using namespace Cult::Types;
-
     class Generator
     {
     public:
-      static Void
+      static void
       usage ();
 
       // Assign names to global declarations.
       //
-      static Void
+      static void
       process_names (options const&,
                      XSDFrontend::SemanticGraph::Schema&,
                      XSDFrontend::SemanticGraph::Path const&);
@@ -42,13 +35,13 @@ namespace CXX
       //
       struct Failed {};
 
-      static UnsignedLong
+      static size_t
       generate (options const&,
                 XSDFrontend::SemanticGraph::Schema&,
                 XSDFrontend::SemanticGraph::Path const&,
-                Boolean file_per_type,
+                bool file_per_type,
                 TypeMap::Namespaces& type_map,
-                Boolean gen_driver,
+                bool gen_driver,
                 const WarningSet& disabled_warnings,
                 FileList&,
                 AutoUnlinks&);