New upstream release

1 files changed, 16 insertions, 30 deletions

diff --git a/libxsd-frontend/xsd-frontend/semantic-graph/annotation.hxx b/libxsd-frontend/xsd-frontend/semantic-graph/annotation.hxx
index 661ac72..0464f4f 100644
--- a/libxsd-frontend/xsd-frontend/semantic-graph/annotation.hxx
+++ b/libxsd-frontend/xsd-frontend/semantic-graph/annotation.hxx
@@ -1,6 +1,5 @@
 // file      : xsd-frontend/semantic-graph/annotation.hxx
-// 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
 
 #ifndef XSD_FRONTEND_SEMANTIC_GRAPH_ANNOTATION_HXX
@@ -25,29 +24,20 @@ namespace XSDFrontend
         return *annotation_;
       }
 
-    protected:
-      friend class Bits::Graph<Node, Edge>;
-
-      Annotates ()
-          : annotation_ (0)
-      {
-      }
+    public:
+      Annotates (): annotation_ (0) {}
 
-      Void
+      void
       set_left_node (Annotation& a)
       {
         annotation_ = &a;
       }
 
-      Void
-      set_right_node (Node&)
-      {
-      }
+      void
+      set_right_node (Node&) {}
 
-      Void
-      set_right_node (Edge&)
-      {
-      }
+      void
+      set_right_node (Edge&) {}
 
     private:
       Annotation* annotation_;
@@ -58,30 +48,26 @@ namespace XSDFrontend
     class Annotation: public virtual Node
     {
     public:
-      WideString const&
+      String const&
       documentation () const
       {
         return documentation_;
       }
 
-    protected:
-      friend class Bits::Graph<Node, Edge>;
-
+    public:
       Annotation (Path const& file,
-                  UnsignedLong line,
-                  UnsignedLong column,
-                  WideString const& documentation)
+                  unsigned long line,
+                  unsigned long column,
+                  String const& documentation)
           : Node (file, line, column), documentation_ (documentation)
       {
       }
 
-      Void
-      add_edge_left (Annotates&)
-      {
-      }
+      void
+      add_edge_left (Annotates&) {}
 
     private:
-      WideString documentation_;
+      String documentation_;
     };
   }
 }