From b8cd7bef48b9208223d061b4302c25dd3b09d413 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 27 Jul 2011 12:00:15 +0200
Subject: Don't assume source and destination scopes are the same

This is not the case for chameleon-style inclusions.
---
 xsde/processing/inheritance/processor.cxx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/xsde/processing/inheritance/processor.cxx b/xsde/processing/inheritance/processor.cxx
index e3b7442..5900239 100644
--- a/xsde/processing/inheritance/processor.cxx
+++ b/xsde/processing/inheritance/processor.cxx
@@ -348,7 +348,6 @@ namespace Processing
                 continue;
               }
 
-
               //wcerr << "type '" << t.name () << "' needs to be moved " <<
               //  "before " << (global.is_a<SG::Type> () ? "type" : "element")
               // << " '" << global.name () << "'" << endl;
@@ -365,6 +364,11 @@ namespace Processing
               // Insert a new Names edge before global.
               //
               {
+                // t.scope () and global.scope () can be different in
+                // case of the chameleon inclusion.
+                //
+                Scope& scope (global.scope ());
+
                 // Convert to the insert-after call.
                 //
                 Scope::NamesIterator i (scope.find (global.named ()));
-- 
cgit v1.1