1 files changed, 12 insertions, 11 deletions
diff --git a/libxsd-frontend/xsd-frontend/transformations/schema-per-type.hxx b/libxsd-frontend/xsd-frontend/transformations/schema-per-type.hxx
index 89b6d83..8b6a69e 100644
--- a/libxsd-frontend/xsd-frontend/transformations/schema-per-type.hxx
+++ b/libxsd-frontend/xsd-frontend/transformations/schema-per-type.hxx
@@ -1,13 +1,13 @@
 // file      : xsd-frontend/transformations/schema-per-type.hxx
-// author    : Boris Kolpackov <boris@codesynthesis.com>
-// copyright : Copyright (c) 2006-2010 Code Synthesis Tools CC
+// copyright : Copyright (c) 2006-2014 Code Synthesis Tools CC
 // license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
 
 #ifndef XSD_FRONTEND_TRANSFORMATIONS_SCHEMA_PER_TYPE_HXX
 #define XSD_FRONTEND_TRANSFORMATIONS_SCHEMA_PER_TYPE_HXX
 
-#include <cult/types.hxx>
-#include <cult/containers/vector.hxx>
+#include <vector>
+
+#include <xsd-frontend/types.hxx>
 
 #include <xsd-frontend/semantic-graph/elements.hxx> // Path
 #include <xsd-frontend/semantic-graph/schema.hxx>
@@ -16,8 +16,6 @@ namespace XSDFrontend
 {
   namespace Transformations
   {
-    using namespace Cult::Types;
-
     class SchemaPerTypeTranslator
     {
     public:
@@ -27,8 +25,8 @@ namespace XSDFrontend
       // The following two functions should return empty string if
       // there is no match.
       //
-      virtual WideString
-      translate_type (WideString const& ns, WideString const& name) = 0;
+      virtual String
+      translate_type (String const& ns, String const& name) = 0;
 
       virtual NarrowString
       translate_schema (NarrowString const& abs_path) = 0;
@@ -46,13 +44,16 @@ namespace XSDFrontend
       // with the by_value_key key and it is true, then the schema
       // for this type is included "strongly".
       //
-      SchemaPerType (SchemaPerTypeTranslator&, Char const* by_value_key = 0);
+      SchemaPerType (SchemaPerTypeTranslator&,
+                     bool fat_type_file,
+                     char const* by_value_key = 0);
 
-      Cult::Containers::Vector<SemanticGraph::Schema*>
+      std::vector<SemanticGraph::Schema*>
       transform (SemanticGraph::Schema&);
 
     private:
-      Char const* by_value_key_;
+      bool fat_type_file_;
+      char const* by_value_key_;
       SchemaPerTypeTranslator& trans_;
     };
   }