From 8286ac511144e4f17d34eac9affb97e50646344a 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:25:44 +0200
Subject: Imported Upstream version 4.0.0

---
 .../xsd-frontend/transformations/simplifier.cxx    | 23 +++++++++-------------
 1 file changed, 9 insertions(+), 14 deletions(-)

(limited to 'libxsd-frontend/xsd-frontend/transformations/simplifier.cxx')

diff --git a/libxsd-frontend/xsd-frontend/transformations/simplifier.cxx b/libxsd-frontend/xsd-frontend/transformations/simplifier.cxx
index 2ccaed2..9372a4a 100644
--- a/libxsd-frontend/xsd-frontend/transformations/simplifier.cxx
+++ b/libxsd-frontend/xsd-frontend/transformations/simplifier.cxx
@@ -1,19 +1,14 @@
 // file      : xsd-frontend/transformations/simplifier.cxx
-// 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
 
-#include <xsd-frontend/transformations/simplifier.hxx>
-
 #include <xsd-frontend/semantic-graph.hxx>
 #include <xsd-frontend/traversal.hxx>
 
-#include <cult/containers/vector.hxx>
+#include <xsd-frontend/transformations/simplifier.hxx>
 
 namespace XSDFrontend
 {
-  using namespace Cult;
-
   namespace
   {
     struct Compositor: Traversal::All,
@@ -25,7 +20,7 @@ namespace XSDFrontend
       {
       }
 
-      virtual Void
+      virtual void
       traverse (SemanticGraph::All& a)
       {
         // The all compositor cannot contain compositors.
@@ -34,7 +29,7 @@ namespace XSDFrontend
           remove (a);
       }
 
-      virtual Void
+      virtual void
       traverse (SemanticGraph::Choice& c)
       {
         // Do the depth-first traversal so that we take into account
@@ -54,7 +49,7 @@ namespace XSDFrontend
           remove (c);
       }
 
-      virtual Void
+      virtual void
       traverse (SemanticGraph::Sequence& s)
       {
         // Do the depth-first traversal so that we take into account
@@ -73,7 +68,7 @@ namespace XSDFrontend
       }
 
     private:
-      virtual Void
+      virtual void
       remove (SemanticGraph::Compositor& c)
       {
         using SemanticGraph::Node;
@@ -106,7 +101,7 @@ namespace XSDFrontend
     //
     struct Type: Traversal::Complex
     {
-      virtual Void
+      virtual void
       traverse (SemanticGraph::Complex& c)
       {
         if (c.contains_compositor_p ())
@@ -119,7 +114,7 @@ namespace XSDFrontend
     //
     struct Uses: Traversal::Uses
     {
-      virtual Void
+      virtual void
       traverse (Type& u)
       {
         SemanticGraph::Schema& s (u.schema ());
@@ -135,7 +130,7 @@ namespace XSDFrontend
 
   namespace Transformations
   {
-    Void Simplifier::
+    void Simplifier::
     transform (SemanticGraph::Schema& s, SemanticGraph::Path const&)
     {
       Traversal::Schema schema;
-- 
cgit v1.2.3