From f7adcb49794d9a2964f402b90498cc0416418c78 Mon Sep 17 00:00:00 2001
From: Markus Schorn <markus.schorn@windriver.com>
Date: Fri, 7 Nov 2008 15:00:20 +0000
Subject: [PATCH] Fixes deletion of arguments in pdom.

---
 .../core/pdom/dom/cpp/PDOMCPPArgumentList.java    | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPArgumentList.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPArgumentList.java
index 7bf6f2244c8..cb1a5681a93 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPArgumentList.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPArgumentList.java
@@ -60,27 +60,26 @@ public class PDOMCPPArgumentList {
 	/**
 	 * Restores an array of template arguments from the database.
 	 */
-	public static void clearArguments(PDOMNode parent, int rec) throws CoreException {
+	public static void clearArguments(PDOMNode parent, final int record) throws CoreException {
 		final PDOMLinkage linkage= parent.getLinkage();
 		final Database db= linkage.getPDOM().getDB();
-		final short len= db.getShort(rec);
+		final short len= db.getShort(record);
 		
 		Assert.isTrue(len >= 0 && len <= (Database.MAX_MALLOC_SIZE-2)/8);
-		rec+=2;
+		int p= record+2;
 		for (int i=0; i<len; i++) {
-			rec++;
-			final int typeRec= db.getInt(rec);
+			final int typeRec= db.getInt(p);
 			if (typeRec != 0) {
 				final IType t= (IType) linkage.getNode(typeRec);
 				linkage.deleteType(t, parent.getRecord());
 			}			
-			final int nonTypeValueRec= db.getInt(rec+4);
+			final int nonTypeValueRec= db.getInt(p+4);
 			if (nonTypeValueRec != 0) {
 				db.getString(nonTypeValueRec).delete();
 			} 
-			rec+= 8;
+			p+= 8;
 		}
-		db.free(rec);
+		db.free(record);
 	}
 
 	/**