From 26899a31d9a85e6ec6cfb782b0977af05e3330c1 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 22 Jun 2012 11:51:14 +0200
Subject: Get rid of dependency on libcult

---
 xsd-frontend/semantic-graph/elements.hxx | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'xsd-frontend/semantic-graph/elements.hxx')

diff --git a/xsd-frontend/semantic-graph/elements.hxx b/xsd-frontend/semantic-graph/elements.hxx
index ad70221..1847572 100644
--- a/xsd-frontend/semantic-graph/elements.hxx
+++ b/xsd-frontend/semantic-graph/elements.hxx
@@ -21,7 +21,7 @@
 #include <cutl/container/pointer-iterator.hxx>
 #include <cutl/compiler/context.hxx>
 
-#include <cult/types.hxx>
+#include <xsd-frontend/types.hxx>
 
 namespace XSDFrontend
 {
@@ -31,8 +31,6 @@ namespace XSDFrontend
 
     using container::pointer_iterator;
 
-    using namespace Cult::Types;
-
     //
     //
     typedef boost::filesystem::path Path;
@@ -181,7 +179,7 @@ namespace XSDFrontend
 
     //
     //
-    typedef WideString Name;
+    typedef String Name;
 
 
     //
@@ -648,7 +646,7 @@ namespace XSDFrontend
     class Restricts: public virtual Inherits
     {
     public:
-      typedef std::map<WideString, WideString> Facets;
+      typedef std::map<String, String> Facets;
       typedef Facets::iterator FacetIterator;
 
       bool
@@ -670,7 +668,7 @@ namespace XSDFrontend
       }
 
       FacetIterator
-      facet_find (WideString const& name)
+      facet_find (String const& name)
       {
         return facets_.find (name);
       }
@@ -782,7 +780,7 @@ namespace XSDFrontend
 
       struct NoValue {};
 
-      WideString
+      String
       value () const
       {
         if (value_type_ != ValueType::none)
@@ -794,14 +792,14 @@ namespace XSDFrontend
       //
       //
       void
-      default_ (WideString const& v)
+      default_ (String const& v)
       {
         value_ = v;
         value_type_ = ValueType::default_;
       }
 
       void
-      fixed (WideString const& v)
+      fixed (String const& v)
       {
         value_ = v;
         value_type_ = ValueType::fixed;
@@ -841,7 +839,7 @@ namespace XSDFrontend
         };
       };
 
-      WideString value_;
+      String value_;
       ValueType::Value value_type_;
     };
 
-- 
cgit v1.1