summaryrefslogtreecommitdiff
path: root/src/libs/cplusplus/ResolveExpression.cpp
diff options
context:
space:
mode:
authorErik Verbruggen <erik.verbruggen@digia.com>2013-04-19 14:04:13 +0200
committerErik Verbruggen <erik.verbruggen@digia.com>2013-04-19 14:14:13 +0200
commit8b8a5db129bb5c30e2626c80228e8e2f5b1db1b9 (patch)
treea74e755f939d2a2737f35ae505ed1ddc853cce7b /src/libs/cplusplus/ResolveExpression.cpp
parent5658eb69aafe324ef9c059c2b6d4d796b13f0cc1 (diff)
downloadqt-creator-8b8a5db129bb5c30e2626c80228e8e2f5b1db1b9.tar.gz
Revert "C++: fix support for typedef of templated typedefs"
Infinite recursion in the lookup of: struct common_type { public: typedef typename common_type<typename common_type<_Tp, _Up>::type, V>::type type; }; This reverts commit 9a56ce4e85bec81c521258f44e9076d0bc9cce92 Change-Id: I675fe39018789cd04127d105eb983d2cb7798ca5 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Diffstat (limited to 'src/libs/cplusplus/ResolveExpression.cpp')
-rw-r--r--src/libs/cplusplus/ResolveExpression.cpp11
1 files changed, 2 insertions, 9 deletions
diff --git a/src/libs/cplusplus/ResolveExpression.cpp b/src/libs/cplusplus/ResolveExpression.cpp
index 8a72fc1fc2..029bcee00d 100644
--- a/src/libs/cplusplus/ResolveExpression.cpp
+++ b/src/libs/cplusplus/ResolveExpression.cpp
@@ -690,15 +690,8 @@ bool ResolveExpression::visit(CallAST *ast)
}
} else if (Function *funTy = ty->asFunctionType()) {
- if (maybeValidPrototype(funTy, actualArgumentCount)) {
- LookupItem item;
- item.setType(funTy->returnType().simplified());
- item.setScope(scope);
- // we have to remember a binding because it can be a template instantiation
- item.setBinding(result.binding());
-
- _results.append(item);
- }
+ if (maybeValidPrototype(funTy, actualArgumentCount))
+ addResult(funTy->returnType().simplified(), scope);
} else if (Class *classTy = ty->asClassType()) {
// Constructor call