1 files changed, 25 insertions, 32 deletions

diff --git a/libxsd-frontend/xsd-frontend/semantic-graph/particle.cxx b/libxsd-frontend/xsd-frontend/semantic-graph/particle.cxx
index f8c93de..c3269e6 100644
--- a/libxsd-frontend/xsd-frontend/semantic-graph/particle.cxx
+++ b/libxsd-frontend/xsd-frontend/semantic-graph/particle.cxx
@@ -1,61 +1,54 @@
 // file      : xsd-frontend/semantic-graph/particle.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/particle.hxx>
 
 namespace XSDFrontend
 {
   namespace SemanticGraph
   {
-    namespace RTTI = Cult::RTTI;
-
-    using RTTI::Access;
-    using RTTI::TypeInfo;
-
     // ContainsParticle
     //
-    namespace
-    {
-      struct ContainsParticleInit
-      {
-        ContainsParticleInit ()
-        {
-          TypeInfo ti (typeid (ContainsParticle));
-          ti.add_base (Access::public_, true, typeid (Edge));
-          RTTI::insert (ti);
-        }
-
-      } contains_particle_init_;
-    }
-
     ContainsParticle::
-    ContainsParticle (UnsignedLong min, UnsignedLong max)
+    ContainsParticle (unsigned long min, unsigned long max)
         : particle_ (0), compositor_ (0), min_ (min), max_ (max)
     {
     }
 
     // Particle
     //
+    Particle::
+    Particle ()
+        : contained_particle_ (0)
+    {
+    }
+
     namespace
     {
+      using compiler::type_info;
+
+      struct ContainsParticleInit
+      {
+        ContainsParticleInit ()
+        {
+          type_info ti (typeid (ContainsParticle));
+          ti.add_base (typeid (Edge));
+          insert (ti);
+        }
+      } contains_particle_init_;
+
       struct ParticleInit
       {
         ParticleInit ()
         {
-          TypeInfo ti (typeid (Particle));
-          ti.add_base (Access::public_, true, typeid (Node));
-          RTTI::insert (ti);
+          type_info ti (typeid (Particle));
+          ti.add_base (typeid (Node));
+          insert (ti);
         }
-
       } particle_init_;
     }
-
-    Particle::
-    Particle ()
-        : contained_particle_ (0)
-    {
-    }
   }
 }