Imported Upstream version 4.0.0upstream/4.0.0

1 files changed, 11 insertions, 21 deletions

diff --git a/libxsd-frontend/xsd-frontend/semantic-graph/fundamental.hxx.m4 b/libxsd-frontend/xsd-frontend/semantic-graph/fundamental.hxx.m4
index f5a88a9..52c9c89 100644
--- a/libxsd-frontend/xsd-frontend/semantic-graph/fundamental.hxx.m4
+++ b/libxsd-frontend/xsd-frontend/semantic-graph/fundamental.hxx.m4
@@ -1,8 +1,7 @@
 divert(-1)
 
 # file      : xsd-frontend/semantic-graph/fundamental.hxx.m4
-# 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
 
 include(`fundamental.m4')
@@ -15,20 +14,17 @@ define(`fundamental_type_impl', `
       //
       class $1: public virtual Type
       {
-      protected:
-        friend class Bits::Graph<Node, Edge>;
-
+      public:
         $1 (Path const& file,
-            SemanticGraph::UnsignedLong line,
-            SemanticGraph::UnsignedLong column);
+            unsigned long line,
+            unsigned long column);
       };')
 divert(0)dnl
 dnl
 dnl
 dnl
 // file      : xsd-frontend/semantic-graph/fundamental.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
 
 // Note, that this file is automatically generated!
@@ -50,8 +46,6 @@ namespace XSDFrontend
       class Type: public virtual SemanticGraph::Type
       {
       protected:
-        friend class Bits::Graph<Node, Edge>;
-
         Type ();
       };
 dnl
@@ -106,12 +100,10 @@ fundamental_type(`id')
       class IdRef: public virtual Type,
                    public virtual Specialization
       {
-      protected:
-        friend class Bits::Graph<Node, Edge>;
-
+      public:
         IdRef (Path const& file,
-               SemanticGraph::UnsignedLong line,
-               SemanticGraph::UnsignedLong column);
+               unsigned long line,
+               unsigned long column);
       };
 
 
@@ -120,12 +112,10 @@ fundamental_type(`id')
       class IdRefs: public virtual Type,
                     public virtual Specialization
       {
-      protected:
-        friend class Bits::Graph<Node, Edge>;
-
+      public:
         IdRefs (Path const& file,
-                SemanticGraph::UnsignedLong line,
-                SemanticGraph::UnsignedLong column);
+                unsigned long line,
+                unsigned long column);
       };
 dnl
 dnl URI.