From 536b0879fc05fa0379e4b9bc997508aaf67bbbd1 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Fri, 5 Sep 2014 13:57:39 +0200 Subject: Use scope of name used in pragma for template instantiations --- odb/processor.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'odb/processor.cxx') diff --git a/odb/processor.cxx b/odb/processor.cxx index a08d986..cdfd883 100644 --- a/odb/processor.cxx +++ b/odb/processor.cxx @@ -2184,7 +2184,7 @@ namespace // the session value. // bool found (false); - for (semantics::scope* s (&c.scope ());; s = &s->scope_ ()) + for (semantics::scope* s (&class_scope (c));; s = &s->scope_ ()) { using semantics::namespace_; @@ -2667,7 +2667,7 @@ namespace // See if any of the namespaces containing this class specify // a pointer. // - for (semantics::scope* s (&c.scope ());; s = &s->scope_ ()) + for (semantics::scope* s (&class_scope (c));; s = &s->scope_ ()) { using semantics::namespace_; @@ -2754,7 +2754,7 @@ namespace // Resolve scope is the scope of the class. // - resolve_scope = c.scope ().tree_node (); + resolve_scope = class_scope (c).tree_node (); } } -- cgit v1.1