diff options
| author | Roberto Raggi <[email protected]> | 2010-07-20 15:04:50 +0200 |
|---|---|---|
| committer | Roberto Raggi <[email protected]> | 2010-07-20 15:10:02 +0200 |
| commit | f895cbb472fd4c1dc779b4b830cac9dd72046815 (patch) | |
| tree | 22dfd525ae3a36d7b3e7d78cb691dea59e9ada7b /src/libs/cplusplus/ResolveExpression.cpp | |
| parent | 3b48da9391dd66dbfa9c6a68713ba7d5f90da054 (diff) | |
Sorry this was not supposed to be committed.
Revert "Revert "Try to fix the type rewriter.""
This reverts commit c9bc1e7c64fb73e8148b65dfe7a4521121331efc.
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 651af198717..8bbdb8f05a0 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()); |