diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2012-05-09 17:25:13 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2012-05-09 17:25:13 +0200 |
commit | c2d38a4c6abd15c898492f09b4646eb93a01da69 (patch) | |
tree | cc90cfd1d251b9c508648060e5a1c584a4514972 /xsde/xsde.cxx | |
parent | 713324411804114f2699c6c127c659345d7359d5 (diff) |
Update to match new libxsd-frontend interface
Diffstat (limited to 'xsde/xsde.cxx')
-rw-r--r-- | xsde/xsde.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/xsde/xsde.cxx b/xsde/xsde.cxx index 1220da9..a14eb94 100644 --- a/xsde/xsde.cxx +++ b/xsde/xsde.cxx @@ -3,6 +3,8 @@ // copyright : Copyright (c) 2005-2011 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file +#include <vector> +#include <memory> // std::auto_ptr #include <iostream> #include <boost/filesystem/fstream.hpp> @@ -50,9 +52,7 @@ typedef Cult::Containers::Vector<NarrowString> NarrowStrings; namespace SemanticGraph = XSDFrontend::SemanticGraph; namespace Transformations = XSDFrontend::Transformations; -using std::wcerr; -using std::wcout; -using std::endl; +using namespace std; namespace CLI { @@ -647,7 +647,7 @@ main (Int argc, Char* argv[]) loc_translator, disabled_w); - Evptr<SemanticGraph::Schema> schema; + auto_ptr<SemanticGraph::Schema> schema; try { @@ -1112,7 +1112,7 @@ main (Int argc, Char* argv[]) loc_translator, disabled_w); - Evptr<SemanticGraph::Schema> schema (parser.parse (paths)); + auto_ptr<SemanticGraph::Schema> schema (parser.parse (paths)); // Morph anonymous types. // @@ -1177,7 +1177,7 @@ main (Int argc, Char* argv[]) // Rearrange the graph so that each type is in a seperate // schema file. // - typedef Cult::Containers::Vector<SemanticGraph::Schema*> Schemas; + typedef std::vector<SemanticGraph::Schema*> Schemas; SchemaPerTypeTranslator type_translator ( common_ops.value<CLI::type_file_regex> (), @@ -1194,7 +1194,7 @@ main (Int argc, Char* argv[]) // Generate code. // - for (Schemas::Iterator b (schemas.begin ()), i (b), e (schemas.end ()); + for (Schemas::iterator b (schemas.begin ()), i (b), e (schemas.end ()); i != e; ++i) { SemanticGraph::Schema& s (**i); |