From 697ec700373ef8a6afc9d07236f23a2f32ddf87c Mon Sep 17 00:00:00 2001
From: Nikolai Kosjar <nikolai.kosjar@digia.com>
Date: Tue, 8 Apr 2014 09:11:10 -0400
Subject: 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>
---
 src/libs/cplusplus/LookupContext.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/libs/cplusplus/LookupContext.cpp')

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] =
-- 
cgit v1.2.1