From 04b85fcd5b20fecfd58cfb46ccd1fb051c46d248 Mon Sep 17 00:00:00 2001
From: Markus Schorn <markus.schorn@windriver.com>
Date: Thu, 19 Aug 2010 13:58:19 +0000
Subject: [PATCH] Bug 305978: Fix encoding of deleted function flag.

---
 .../cdt/internal/core/pdom/dom/cpp/PDOMCPPFunction.java      | 2 +-
 .../core/pdom/dom/cpp/PDOMCPPFunctionSpecialization.java     | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFunction.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFunction.java
index b4b16a48287..c972adea008 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFunction.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFunction.java
@@ -100,7 +100,7 @@ class PDOMCPPFunction extends PDOMCPPBinding implements ICPPFunction, IPDOMOverl
 	}
 
 	private short getAnnotation(ICPPFunction function) throws DOMException {
-		int annot= PDOMCPPAnnotation.encodeAnnotation(function);
+		int annot= PDOMCPPAnnotation.encodeAnnotation(function) & 0xff;
 		if (function.hasParameterPack()) {
 			annot |= (1<<ANNOT_PARAMETER_PACK);
 		}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFunctionSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFunctionSpecialization.java
index 9030f0ecdd3..93f48d1dfaf 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFunctionSpecialization.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFunctionSpecialization.java
@@ -137,10 +137,13 @@ class PDOMCPPFunctionSpecialization extends PDOMCPPSpecialization implements ICP
 	}
 
 	private short getAnnotation(ICPPFunction astFunction) throws DOMException {
-		int annot= PDOMCPPAnnotation.encodeAnnotation(astFunction);
+		int annot= PDOMCPPAnnotation.encodeAnnotation(astFunction) & 0xff;
 		if (astFunction.hasParameterPack()) {
 			annot |= (1 << ANNOT_PARAMETER_PACK);
 		}
+		if (astFunction.isDeleted()) {
+			annot |= (1<<ANNOT_IS_DELETED);
+		}
 		return (short) annot;
 	}