diff options
| author | Nikolai Kosjar <nikolai.kosjar@digia.com> | 2014-04-08 09:11:10 -0400 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@digia.com> | 2014-04-09 17:32:04 +0200 |
| commit | 697ec700373ef8a6afc9d07236f23a2f32ddf87c (patch) | |
| tree | be211a0154c55062527ae3656ac50d417a6117a8 /src/libs/cplusplus/LookupContext.cpp | |
| parent | 966f2aebc4ea67c8445dbf299138cf3fee1c8cf9 (diff) | |
| download | qt-creator-697ec700373ef8a6afc9d07236f23a2f32ddf87c.tar.gz | |
Revert "C++: nested class with enclosing template class"
This reverts commit 5d76b4339a717cd944c4a3c27eac860b8111d645 since it
might lead to an infinite loop.
Task-number: QTCREATORBUG-11999
Change-Id: I12c7f3afc4aa53a83ddc2bf2d33eb76c29b747ee
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/libs/cplusplus/LookupContext.cpp')
| -rw-r--r-- | src/libs/cplusplus/LookupContext.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/libs/cplusplus/LookupContext.cpp b/src/libs/cplusplus/LookupContext.cpp index b80ca122bd..05f5900edc 100644 --- a/src/libs/cplusplus/LookupContext.cpp +++ b/src/libs/cplusplus/LookupContext.cpp @@ -1268,7 +1268,6 @@ void ClassOrNamespace::NestedClassInstantiator::instantiate(ClassOrNamespace *en } } - nestedClassOrNamespaceInstantiation->_parent = enclosingTemplateClassInstantiation; instantiate(nestedClassOrNamespace, nestedClassOrNamespaceInstantiation); enclosingTemplateClassInstantiation->_classOrNamespaces[nestedName] = |