From eeea9a4a25e9159fb1811dd14dbc9f7b45ed44de Mon Sep 17 00:00:00 2001
From: Markus Schorn <markus.schorn@windriver.com>
Date: Thu, 27 Nov 2008 10:39:29 +0000
Subject: [PATCH] Defer more instantiations, follow up for bug 256113.

---
 .../internal/core/dom/parser/cpp/semantics/CPPTemplates.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPTemplates.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPTemplates.java
index 6550480bcb5..2cc01be9ed2 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPTemplates.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPTemplates.java
@@ -139,7 +139,7 @@ public class CPPTemplates {
 	public static IBinding instantiate(ICPPTemplateDefinition template, ICPPTemplateArgument[] arguments) {
 		try {
 			arguments= SemanticUtil.getSimplifiedArguments(arguments);
-			if (template instanceof ICPPTemplateTemplateParameter) {
+			if (template instanceof ICPPTemplateTemplateParameter || hasDependentArgument(arguments)) {
 				return deferredInstance(template, arguments);
 			}