1 files changed, 25 insertions, 33 deletions

diff --git a/libxsd-frontend/xsd-frontend/semantic-graph/enumeration.cxx b/libxsd-frontend/xsd-frontend/semantic-graph/enumeration.cxx
index adcf71e..93bcf79 100644
--- a/libxsd-frontend/xsd-frontend/semantic-graph/enumeration.cxx
+++ b/libxsd-frontend/xsd-frontend/semantic-graph/enumeration.cxx
@@ -1,32 +1,45 @@
 // file      : xsd-frontend/semantic-graph/enumeration.cxx
-// 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 <cutl/compiler/type-info.hxx>
+
 #include <xsd-frontend/semantic-graph/enumeration.hxx>
 
 namespace XSDFrontend
 {
   namespace SemanticGraph
   {
-    namespace RTTI = Cult::RTTI;
+    // Enumeration
+    //
+    Enumeration::
+    Enumeration (Path const& file, unsigned long line, unsigned long column)
+        : Node (file, line, column)
+    {
+    }
 
-    using RTTI::Access;
-    using RTTI::TypeInfo;
+    // Enumerator
+    //
+    Enumerator::
+    Enumerator (Path const& file, unsigned long line, unsigned long column)
+        : Node (file, line, column)
+    {
+    }
 
     namespace
     {
+      using compiler::type_info;
+
       // Enumeration
       //
       struct EnumerationInit
       {
         EnumerationInit ()
         {
-          TypeInfo ti (typeid (Enumeration));
-          ti.add_base (Access::public_, true, typeid (Complex));
-          RTTI::insert (ti);
+          type_info ti (typeid (Enumeration));
+          ti.add_base (typeid (Complex));
+          insert (ti);
         }
-
       } enumeration_init_;
 
 
@@ -36,32 +49,11 @@ namespace XSDFrontend
       {
         EnumeratorInit ()
         {
-          TypeInfo ti (typeid (Enumerator));
-          ti.add_base (Access::public_, true, typeid (Instance));
-          RTTI::insert (ti);
+          type_info ti (typeid (Enumerator));
+          ti.add_base (typeid (Instance));
+          insert (ti);
         }
-
       } enumerator_init_;
     }
-
-
-    // Enumeration
-    //
-
-    Enumeration::
-    Enumeration (Path const& file, UnsignedLong line, UnsignedLong column)
-        : Node (file, line, column)
-    {
-    }
-
-
-    // Enumerator
-    //
-
-    Enumerator::
-    Enumerator (Path const& file, UnsignedLong line, UnsignedLong column)
-        : Node (file, line, column)
-    {
-    }
   }
 }