Get rid of dependency on libfrontend-elements

Use libcutl facilities instead.

1 files changed, 24 insertions, 33 deletions

diff --git a/xsd-frontend/semantic-graph/element.cxx b/xsd-frontend/semantic-graph/element.cxx
index dc3ad9f..607fd2c 100644
--- a/xsd-frontend/semantic-graph/element.cxx
+++ b/xsd-frontend/semantic-graph/element.cxx
@@ -3,61 +3,52 @@
 // copyright : Copyright (c) 2005-2011 Code Synthesis Tools CC
 // license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
 
+#include <cutl/compiler/type-info.hxx>
+
 #include <xsd-frontend/semantic-graph/element.hxx>
 
 namespace XSDFrontend
 {
   namespace SemanticGraph
   {
-    namespace RTTI = Cult::RTTI;
-
-    using RTTI::Access;
-    using RTTI::TypeInfo;
-
-
-    // Substitutes
+    // Element
     //
+    Element::
+    Element (Path const& file,
+             UnsignedLong line,
+             UnsignedLong column,
+             Boolean global,
+             Boolean qualified)
+        : Node (file, line, column),
+          Member (global, qualified),
+          substitutes_ (0)
+    {
+    }
+
     namespace
     {
+      using compiler::type_info;
+
       struct SubstitutesInit
       {
         SubstitutesInit ()
         {
-          TypeInfo ti (typeid (Substitutes));
-          ti.add_base (Access::public_, true, typeid (Edge));
-          RTTI::insert (ti);
+          type_info ti (typeid (Substitutes));
+          ti.add_base (typeid (Edge));
+          insert (ti);
         }
-
       } substitutes_init_;
-    }
 
-    // Element
-    //
-    namespace
-    {
       struct ElementInit
       {
         ElementInit ()
         {
-          TypeInfo ti (typeid (Element));
-          ti.add_base (Access::public_, true, typeid (Member));
-          ti.add_base (Access::public_, true, typeid (Particle));
-          RTTI::insert (ti);
+          type_info ti (typeid (Element));
+          ti.add_base (typeid (Member));
+          ti.add_base (typeid (Particle));
+          insert (ti);
         }
-
       } element_init_;
     }
-
-    Element::
-    Element (Path const& file,
-             UnsignedLong line,
-             UnsignedLong column,
-             Boolean global,
-             Boolean qualified)
-        : Node (file, line, column),
-          Member (global, qualified),
-          substitutes_ (0)
-    {
-    }
   }
 }