diff -r 000000000000 -r b16258d2340f applayerprotocols/wapbase/bnf/CRuleMarkedStack.inl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/applayerprotocols/wapbase/bnf/CRuleMarkedStack.inl	Tue Feb 02 01:09:52 2010 +0200
@@ -0,0 +1,47 @@
+// Copyright (c) 2000-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+
+// note: MergeToMark is not atomic - a leave means that data has been removed
+template <TBool StackOwnsEntry>
+inline void CRuleMarkedStack<StackOwnsEntry>::MergeToMarkL(TInt aMarkType)
+	{
+	const TInt lastMark=this->RemoveMark(aMarkType);
+	if (this->Count()>lastMark)
+		{
+		CBNFNode* currentRule=this->Pop();
+		if (StackOwnsEntry)
+			CleanupStack::PushL(currentRule);
+			
+		while (this->Count()>lastMark)
+			{
+			CBNFNode* nextRule=this->Pop();
+			if (StackOwnsEntry)
+				CleanupStack::PushL(nextRule);
+			currentRule->ReparentL(nextRule);
+			if (StackOwnsEntry)
+				{
+				CleanupStack::Pop(2); // nextRule, currentRule
+				CleanupStack::PushL(nextRule); // nextRule
+				}
+			
+			currentRule=nextRule;
+			}
+
+		if (StackOwnsEntry)
+			CleanupStack::Pop(); // currentRule
+		this->PushL(currentRule);
+		}
+	}