From 8286ac511144e4f17d34eac9affb97e50646344a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Wed, 23 Jul 2014 15:25:44 +0200
Subject: Imported Upstream version 4.0.0

---
 .../xsd-frontend/semantic-graph/complex.cxx        | 43 ++++++++++------------
 1 file changed, 20 insertions(+), 23 deletions(-)

(limited to 'libxsd-frontend/xsd-frontend/semantic-graph/complex.cxx')

diff --git a/libxsd-frontend/xsd-frontend/semantic-graph/complex.cxx b/libxsd-frontend/xsd-frontend/semantic-graph/complex.cxx
index 0cc265f..8433a0e 100644
--- a/libxsd-frontend/xsd-frontend/semantic-graph/complex.cxx
+++ b/libxsd-frontend/xsd-frontend/semantic-graph/complex.cxx
@@ -1,34 +1,15 @@
 // file      : xsd-frontend/semantic-graph/complex.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/complex.hxx>
 
 namespace XSDFrontend
 {
   namespace SemanticGraph
   {
-    namespace RTTI = Cult::RTTI;
-
-    using RTTI::Access;
-    using RTTI::TypeInfo;
-
-    namespace
-    {
-      struct ComplexInit
-      {
-        ComplexInit ()
-        {
-          TypeInfo ti (typeid (Complex));
-          ti.add_base (Access::public_, true, typeid (Type));
-          ti.add_base (Access::public_, true, typeid (Scope));
-          RTTI::insert (ti);
-        }
-
-      } complex_init_;
-    }
-
     Complex::
     Complex ()
         : mixed_ (false), contains_compositor_ (0)
@@ -36,10 +17,26 @@ namespace XSDFrontend
     }
 
     Complex::
-    Complex (Path const& file, UnsignedLong line, UnsignedLong column)
+    Complex (Path const& file, unsigned long line, unsigned long column)
         : Node (file, line, column),
           mixed_ (false), contains_compositor_ (0)
     {
     }
+
+    namespace
+    {
+      using compiler::type_info;
+
+      struct ComplexInit
+      {
+        ComplexInit ()
+        {
+          type_info ti (typeid (Complex));
+          ti.add_base (typeid (Type));
+          ti.add_base (typeid (Scope));
+          insert (ti);
+        }
+      } complex_init_;
+    }
   }
 }
-- 
cgit v1.2.3