Imported Upstream version 4.0.0upstream/4.0.0

1 files changed, 13 insertions, 24 deletions

diff --git a/libxsd-frontend/xsd-frontend/semantic-graph/element.hxx b/libxsd-frontend/xsd-frontend/semantic-graph/element.hxx
index e7046e4..0af164e 100644
--- a/libxsd-frontend/xsd-frontend/semantic-graph/element.hxx
+++ b/libxsd-frontend/xsd-frontend/semantic-graph/element.hxx
@@ -1,6 +1,5 @@
 // file      : xsd-frontend/semantic-graph/element.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_ELEMENT_HXX
@@ -30,20 +29,14 @@ namespace XSDFrontend
         return *root_;
       }
 
-    protected:
-      friend class Bits::Graph<Node, Edge>;
-
-      Substitutes ()
-      {
-      }
-
-      Void
+    public:
+      void
       set_left_node (Element& n)
       {
         substitution_ = &n;
       }
 
-      Void
+      void
       set_right_node (Element& n)
       {
         root_ = &n;
@@ -59,7 +52,7 @@ namespace XSDFrontend
                    public virtual Particle
     {
     public:
-      Boolean
+      bool
       substitutes_p () const
       {
         return substitutes_ != 0;
@@ -72,25 +65,21 @@ namespace XSDFrontend
         return *substitutes_;
       }
 
-    protected:
-      friend class Bits::Graph<Node, Edge>;
-
+    public:
       Element (Path const& file,
-               UnsignedLong line,
-               UnsignedLong column,
-               Boolean global,
-               Boolean qualified);
+               unsigned long line,
+               unsigned long column,
+               bool global,
+               bool qualified);
 
-      Void
+      void
       add_edge_left (Substitutes& e)
       {
         substitutes_ = &e;
       }
 
-      Void
-      add_edge_right (Substitutes&)
-      {
-      }
+      void
+      add_edge_right (Substitutes&) {}
 
       using Member::add_edge_left;
       using Member::add_edge_right;