Imported Upstream version 4.0.0upstream/4.0.0

1 files changed, 10 insertions, 15 deletions

diff --git a/libxsd-frontend/xsd-frontend/semantic-graph/annotation.cxx b/libxsd-frontend/xsd-frontend/semantic-graph/annotation.cxx
index 22793f7..17a0f03 100644
--- a/libxsd-frontend/xsd-frontend/semantic-graph/annotation.cxx
+++ b/libxsd-frontend/xsd-frontend/semantic-graph/annotation.cxx
@@ -1,19 +1,16 @@
 // file      : xsd-frontend/semantic-graph/annotation.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 <cutl/compiler/type-info.hxx>
+
 #include <xsd-frontend/semantic-graph/annotation.hxx>
 
 namespace XSDFrontend
 {
   namespace SemanticGraph
   {
-    namespace RTTI = Cult::RTTI;
-
-    using RTTI::Access;
-    using RTTI::TypeInfo;
-
+    using compiler::type_info;
 
     // Annotates
     //
@@ -23,11 +20,10 @@ namespace XSDFrontend
       {
         AnnotatesInit ()
         {
-          TypeInfo ti (typeid (Annotates));
-          ti.add_base (Access::public_, true, typeid (Edge));
-          RTTI::insert (ti);
+          type_info ti (typeid (Annotates));
+          ti.add_base (typeid (Edge));
+          insert (ti);
         }
-
       } annotates_init_;
     }
 
@@ -39,11 +35,10 @@ namespace XSDFrontend
       {
         AnnotationInit ()
         {
-          TypeInfo ti (typeid (Annotation));
-          ti.add_base (Access::public_, true, typeid (Node));
-          RTTI::insert (ti);
+          type_info ti (typeid (Annotation));
+          ti.add_base (typeid (Node));
+          insert (ti);
         }
-
       } annotation_init_;
     }
   }