From 33b19f0210cd6ab1504071912caee91a95515c7c Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Mon, 19 Jul 2010 20:12:16 +0200
Subject: Try to fix the type rewriter.

---
 src/libs/cplusplus/ResolveExpression.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/libs/cplusplus/ResolveExpression.cpp')

diff --git a/src/libs/cplusplus/ResolveExpression.cpp b/src/libs/cplusplus/ResolveExpression.cpp
index 651af19871..8bbdb8f05a 100644
--- a/src/libs/cplusplus/ResolveExpression.cpp
+++ b/src/libs/cplusplus/ResolveExpression.cpp
@@ -568,9 +568,10 @@ QList<LookupItem> ResolveExpression::getMembers(ClassOrNamespace *binding, const
                 }
 
                 SubstitutionEnvironment env;
-                ContextSubstitution ctxSubst(_context, m.scope());
+                if (m.scope())
+                    env.switchScope(m.scope());
+                env.setContext(_context);
 
-                env.enter(&ctxSubst);
                 env.enter(&map);
                 FullySpecifiedType instantiatedTy = rewriteType(decl->type(), &env, _context.control().data());
 
-- 
cgit v1.2.1