From bada6666c70977a058755ccf232e7d67b24adeed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Wed, 23 Jul 2014 15:21:29 +0200
Subject: New upstream release

---
 .../xsd-frontend/semantic-graph/any.hxx            | 29 +++++++++-------------
 1 file changed, 12 insertions(+), 17 deletions(-)

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

diff --git a/libxsd-frontend/xsd-frontend/semantic-graph/any.hxx b/libxsd-frontend/xsd-frontend/semantic-graph/any.hxx
index ded9bd8..8e42762 100644
--- a/libxsd-frontend/xsd-frontend/semantic-graph/any.hxx
+++ b/libxsd-frontend/xsd-frontend/semantic-graph/any.hxx
@@ -1,12 +1,11 @@
 // file      : xsd-frontend/semantic-graph/any.hxx
-// author    : Boris Kolpackov <boris@codesynthesis.com>
-// copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC
+// copyright : Copyright (c) 2005-2014 Code Synthesis Tools CC
 // license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
 
 #ifndef XSD_FRONTEND_SEMANTIC_GRAPH_ANY_HXX
 #define XSD_FRONTEND_SEMANTIC_GRAPH_ANY_HXX
 
-#include <cult/containers/vector.hxx>
+#include <vector>
 
 #include <xsd-frontend/semantic-graph/elements.hxx>
 #include <xsd-frontend/semantic-graph/particle.hxx>
@@ -19,12 +18,10 @@ namespace XSDFrontend
     class Any: public virtual Nameable,
                public virtual Particle
     {
-      typedef
-      Cult::Containers::Vector<WideString>
-      Namespaces;
+      typedef std::vector<String> Namespaces;
 
     public:
-      typedef Namespaces::ConstIterator NamespaceIterator;
+      typedef Namespaces::const_iterator NamespaceIterator;
 
       NamespaceIterator
       namespace_begin () const
@@ -39,7 +36,7 @@ namespace XSDFrontend
       }
 
     public:
-      Boolean
+      bool
       prototype_p ()
       {
         return prototype_ != 0;
@@ -52,7 +49,7 @@ namespace XSDFrontend
         return *prototype_;
       }
 
-      Void
+      void
       prototype (Any& a)
       {
         assert (prototype_ == 0);
@@ -63,17 +60,15 @@ namespace XSDFrontend
       Namespace&
       definition_namespace ();
 
-    protected:
-      friend class Bits::Graph<Node, Edge>;
-
+    public:
       Any (Path const& file,
-           UnsignedLong line,
-           UnsignedLong column,
-           WideString const& namespaces);
+           unsigned long line,
+           unsigned long column,
+           String const& namespaces);
 
       Any (Path const& file,
-           UnsignedLong line,
-           UnsignedLong column,
+           unsigned long line,
+           unsigned long column,
            NamespaceIterator begin,
            NamespaceIterator end);
 
-- 
cgit v1.2.3