From f335855adec8d1deb92ecb0a39336a1292e7c608 Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Tue, 25 May 2010 16:27:53 +0200
Subject: [PATCH] Warn about unexpected using declarations.
---
src/libs/cplusplus/LookupContext.cpp | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/libs/cplusplus/LookupContext.cpp b/src/libs/cplusplus/LookupContext.cpp
index 4aada73f93a..77880ca06cd 100644
--- a/src/libs/cplusplus/LookupContext.cpp
+++ b/src/libs/cplusplus/LookupContext.cpp
@@ -482,11 +482,15 @@ ClassOrNamespace *ClassOrNamespace::lookupType_helper(const Name *name,
return e;
else if (_templateId) {
- Q_ASSERT(_usings.size() == 1);
- ClassOrNamespace *delegate = _usings.first();
-
- if (ClassOrNamespace *r = delegate->lookupType_helper(name, processed, /*searchInEnclosingScope = */ true))
- return r;
+ if (_usings.size() == 1) {
+ ClassOrNamespace *delegate = _usings.first();
+
+ if (ClassOrNamespace *r = delegate->lookupType_helper(name, processed, /*searchInEnclosingScope = */ true))
+ return r;
+ } else {
+ if (debug)
+ qWarning() << "expected one using declaration. Number of using declarations is:" << _usings.size();
+ }
}
foreach (ClassOrNamespace *u, usings()) {
--
GitLab