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/traversal/compositors.cxx         | 55 +++++++++++-----------
 1 file changed, 27 insertions(+), 28 deletions(-)

(limited to 'libxsd-frontend/xsd-frontend/traversal/compositors.cxx')

diff --git a/libxsd-frontend/xsd-frontend/traversal/compositors.cxx b/libxsd-frontend/xsd-frontend/traversal/compositors.cxx
index d3089fc..f2b3dcd 100644
--- a/libxsd-frontend/xsd-frontend/traversal/compositors.cxx
+++ b/libxsd-frontend/xsd-frontend/traversal/compositors.cxx
@@ -1,6 +1,5 @@
 // file      : xsd-frontend/traversal/compositors.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/traversal/compositors.hxx>
@@ -11,7 +10,7 @@ namespace XSDFrontend
   {
     // ContainsParticle
     //
-    Void ContainsParticle::
+    void ContainsParticle::
     traverse (Type& c)
     {
       dispatch (c.particle ());
@@ -20,7 +19,7 @@ namespace XSDFrontend
 
     // ContainsCompositor
     //
-    Void ContainsCompositor::
+    void ContainsCompositor::
     traverse (Type& c)
     {
       dispatch (c.compositor ());
@@ -29,7 +28,7 @@ namespace XSDFrontend
 
     // Compositor
     //
-    Void Compositor::
+    void Compositor::
     traverse (Type& c)
     {
       pre (c);
@@ -37,25 +36,25 @@ namespace XSDFrontend
       post (c);
     }
 
-    Void Compositor::
+    void Compositor::
     pre (Type&)
     {
     }
 
-    Void Compositor::
+    void Compositor::
     contains (Type& c)
     {
       iterate_and_dispatch (
         c.contains_begin (), c.contains_end (), edge_traverser ());
     }
 
-    Void Compositor::
-    contains (Type& c, EdgeDispatcherBase& d)
+    void Compositor::
+    contains (Type& c, EdgeDispatcher& d)
     {
       iterate_and_dispatch (c.contains_begin (), c.contains_end (), d);
     }
 
-    Void Compositor::
+    void Compositor::
     post (Type&)
     {
     }
@@ -63,7 +62,7 @@ namespace XSDFrontend
 
     // All
     //
-    Void All::
+    void All::
     traverse (Type& c)
     {
       pre (c);
@@ -71,25 +70,25 @@ namespace XSDFrontend
       post (c);
     }
 
-    Void All::
+    void All::
     pre (Type&)
     {
     }
 
-    Void All::
+    void All::
     contains (Type& c)
     {
       iterate_and_dispatch (
         c.contains_begin (), c.contains_end (), edge_traverser ());
     }
 
-    Void All::
-    contains (Type& c, EdgeDispatcherBase& d)
+    void All::
+    contains (Type& c, EdgeDispatcher& d)
     {
       iterate_and_dispatch (c.contains_begin (), c.contains_end (), d);
     }
 
-    Void All::
+    void All::
     post (Type&)
     {
     }
@@ -97,7 +96,7 @@ namespace XSDFrontend
 
     // Choice
     //
-    Void Choice::
+    void Choice::
     traverse (Type& c)
     {
       pre (c);
@@ -105,25 +104,25 @@ namespace XSDFrontend
       post (c);
     }
 
-    Void Choice::
+    void Choice::
     pre (Type&)
     {
     }
 
-    Void Choice::
+    void Choice::
     contains (Type& c)
     {
       iterate_and_dispatch (
         c.contains_begin (), c.contains_end (), edge_traverser ());
     }
 
-    Void Choice::
-    contains (Type& c, EdgeDispatcherBase& d)
+    void Choice::
+    contains (Type& c, EdgeDispatcher& d)
     {
       iterate_and_dispatch (c.contains_begin (), c.contains_end (), d);
     }
 
-    Void Choice::
+    void Choice::
     post (Type&)
     {
     }
@@ -131,7 +130,7 @@ namespace XSDFrontend
 
     // Sequence
     //
-    Void Sequence::
+    void Sequence::
     traverse (Type& c)
     {
       pre (c);
@@ -139,25 +138,25 @@ namespace XSDFrontend
       post (c);
     }
 
-    Void Sequence::
+    void Sequence::
     pre (Type&)
     {
     }
 
-    Void Sequence::
+    void Sequence::
     contains (Type& c)
     {
       iterate_and_dispatch (
         c.contains_begin (), c.contains_end (), edge_traverser ());
     }
 
-    Void Sequence::
-    contains (Type& c, EdgeDispatcherBase& d)
+    void Sequence::
+    contains (Type& c, EdgeDispatcher& d)
     {
       iterate_and_dispatch (c.contains_begin (), c.contains_end (), d);
     }
 
-    Void Sequence::
+    void Sequence::
     post (Type&)
     {
     }
-- 
cgit v1.2.3