diff options
author | Roberto Raggi <roberto.raggi@nokia.com> | 2010-07-19 20:12:16 +0200 |
---|---|---|
committer | Roberto Raggi <roberto.raggi@nokia.com> | 2010-07-19 20:12:16 +0200 |
commit | 33b19f0210cd6ab1504071912caee91a95515c7c (patch) | |
tree | 58a0e1ea6da2f12005f5916ee967680349e47088 /src/libs/cplusplus/ResolveExpression.cpp | |
parent | 55936532c295a3eea221ac6aaca7353f41761c76 (diff) | |
download | qt-creator-33b19f0210cd6ab1504071912caee91a95515c7c.tar.gz |
Try to fix the type rewriter.
Diffstat (limited to 'src/libs/cplusplus/ResolveExpression.cpp')
-rw-r--r-- | src/libs/cplusplus/ResolveExpression.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
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()); |