From 8f2f79f4f286903e9fe668e06290a876eb976f07 Mon Sep 17 00:00:00 2001
From: Sergey Prigogin <eclipse.sprigogin@gmail.com>
Date: Tue, 5 Feb 2013 09:15:49 -0800
Subject: [PATCH] Bug 399592 - Template Argument Deduction throws
 AssertionErrors

Change-Id: I891a0ea21e54c2e0a4969a351b3366859525dcd4
Reviewed-on: https://git.eclipse.org/r/10165
Reviewed-by: Sergey Prigogin <eclipse.sprigogin@gmail.com>
IP-Clean: Sergey Prigogin <eclipse.sprigogin@gmail.com>
Tested-by: Sergey Prigogin <eclipse.sprigogin@gmail.com>
---
 .../dom/parser/cpp/semantics/TemplateArgumentDeduction.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/TemplateArgumentDeduction.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/TemplateArgumentDeduction.java
index 555f1ec9e77..8d33b882c8d 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/TemplateArgumentDeduction.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/TemplateArgumentDeduction.java
@@ -619,10 +619,11 @@ public class TemplateArgumentDeduction {
 				}
 				ICPPTemplateArgument pattern = p[j].getExpansionPattern();
 				for (int i= j; i < a.length; i++) {
+					if (i != j)
+						deduct.incPackOffset();
 					if (!deduct.fromTemplateArgument(pattern, a[i], point)) {
 						return false;
 					}
-					deduct.incPackOffset();
 				}
 				break;
 			} else {