Get rid of dependency on libcult

1 files changed, 22 insertions, 31 deletions

diff --git a/xsd/cxx/tree/generator.cxx b/xsd/cxx/tree/generator.cxx
index 4eb4de2..ff2b705 100644
--- a/xsd/cxx/tree/generator.cxx
+++ b/xsd/cxx/tree/generator.cxx
@@ -3,6 +3,7 @@
 // copyright : Copyright (c) 2005-2011 Code Synthesis Tools CC
 // license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
 
+#include <vector>
 #include <iostream>
 
 #include <boost/filesystem/fstream.hpp>
@@ -10,9 +11,6 @@
 #include <cutl/re.hxx>
 #include <cutl/shared-ptr.hxx>
 
-#include <cult/containers/set.hxx>
-#include <cult/containers/vector.hxx>
-
 #include <cutl/compiler/code-stream.hxx>
 #include <cutl/compiler/cxx-indenter.hxx>
 #include <cutl/compiler/sloc-counter.hxx>
@@ -50,10 +48,7 @@
 
 #include "../../../libxsd/xsd/cxx/version.hxx"
 
-using std::endl;
-using std::wcerr;
-using std::wcout;
-
+using namespace std;
 using namespace cutl;
 using namespace XSDFrontend::SemanticGraph;
 
@@ -71,7 +66,7 @@ namespace CXX
 {
   namespace
   {
-    Char const copyright_gpl[] =
+    char const copyright_gpl[] =
     "// Copyright (c) 2005-2011 Code Synthesis Tools CC\n"
     "//\n"
     "// This program was generated by CodeSynthesis XSD, an XML Schema to\n"
@@ -105,7 +100,7 @@ namespace CXX
     "// in the accompanying FLOSSE file.\n"
     "//\n\n";
 
-    Char const copyright_proprietary[] =
+    char const copyright_proprietary[] =
     "// Copyright (c) 2005-2011 Code Synthesis Tools CC\n"
     "//\n"
     "// This program was generated by CodeSynthesis XSD, an XML Schema\n"
@@ -116,7 +111,7 @@ namespace CXX
     "//\n\n";
   }
 
-  Void Tree::Generator::
+  void Tree::Generator::
   usage ()
   {
     CXX::Tree::options::print_usage (wcout);
@@ -125,7 +120,7 @@ namespace CXX
 
   namespace
   {
-    Void
+    void
     open (WideInputFileStream& ifs, NarrowString const& path)
     {
       try
@@ -150,7 +145,7 @@ namespace CXX
       }
     }
 
-    Void
+    void
     append (WideOutputFileStream& os,
             NarrowString const& path,
             WideInputFileStream& default_is)
@@ -170,7 +165,7 @@ namespace CXX
       }
     }
 
-    Void
+    void
     append (WideOutputFileStream& os,
             NarrowStrings const& primary,
             NarrowStrings const& def)
@@ -186,24 +181,20 @@ namespace CXX
   }
 
 
-  UnsignedLong Tree::Generator::
+  size_t Tree::Generator::
   generate (Tree::options const& ops,
             Schema& schema,
             Path const& file_path,
-            Boolean fpt,
+            bool fpt,
             StringLiteralMap const& string_literal_map,
             const WarningSet& disabled_warnings,
             FileList& file_list,
             AutoUnlinks& unlinks)
   {
-    using std::ios_base;
-
     typedef cutl::re::regexsub Regex;
 
-    using Cult::Containers::Vector;
-
-    typedef Vector<Path> Paths;
-    typedef Vector<shared_ptr<WideOutputFileStream> > WideOutputFileStreams;
+    typedef vector<Path> Paths;
+    typedef vector<shared_ptr<WideOutputFileStream> > WideOutputFileStreams;
 
     try
     {
@@ -280,7 +271,7 @@ namespace CXX
 
       //
       //
-      Boolean generate_xml_schema (ops.generate_xml_schema ());
+      bool generate_xml_schema (ops.generate_xml_schema ());
 
       // We could be compiling several schemas at once in which case
       // handling of the --generate-xml-schema option gets tricky: we
@@ -296,9 +287,9 @@ namespace CXX
         }
       }
 
-      Boolean inline_ (ops.generate_inline () && !generate_xml_schema);
-      Boolean forward (ops.generate_forward () && !generate_xml_schema);
-      Boolean source (!generate_xml_schema);
+      bool inline_ (ops.generate_inline () && !generate_xml_schema);
+      bool forward (ops.generate_forward () && !generate_xml_schema);
+      bool source (!generate_xml_schema);
 
       // Generate code.
       //
@@ -370,7 +361,7 @@ namespace CXX
       {
         if (parts > 1)
         {
-          for (UnsignedLong i (0); i < parts; ++i)
+          for (size_t i (0); i < parts; ++i)
           {
             std::ostringstream os;
             os << i;
@@ -430,7 +421,7 @@ namespace CXX
         ixx_path = out_dir / ixx_path;
         fwd_path = out_dir / fwd_path;
 
-        for (Paths::Iterator i (cxx_paths.begin ());
+        for (Paths::iterator i (cxx_paths.begin ());
              i != cxx_paths.end (); ++i)
           *i = out_dir / *i;
       }
@@ -493,7 +484,7 @@ namespace CXX
       //
       if (source)
       {
-        for (Paths::Iterator i (cxx_paths.begin ());
+        for (Paths::iterator i (cxx_paths.begin ());
              i != cxx_paths.end (); ++i)
         {
           shared_ptr<WideOutputFileStream> s (
@@ -514,7 +505,7 @@ namespace CXX
 
       // Print copyright and license.
       //
-      Char const* copyright (
+      char const* copyright (
         ops.proprietary_license () ? copyright_proprietary : copyright_gpl);
 
       if (forward)
@@ -539,7 +530,7 @@ namespace CXX
 
       if (source)
       {
-        for (WideOutputFileStreams::Iterator i (cxx.begin ());
+        for (WideOutputFileStreams::iterator i (cxx.begin ());
              i != cxx.end (); ++i)
           **i << copyright;
       }
@@ -568,7 +559,7 @@ namespace CXX
       // SLOC counter.
       //
       size_t sloc_total (0);
-      Boolean show_sloc (ops.show_sloc ());
+      bool show_sloc (ops.show_sloc ());
 
       typedef
       compiler::ostream_filter<compiler::cxx_indenter, wchar_t>