# HG changeset patch
# User Stefan Karlsson <stefan.karlsson@nokia.com>
# Date 1269950458 -3600
# Node ID c93bcd9bf89c9ae203881ad869058bc1521b4bbd
# Parent  b02a5d2af40b3d769efb6b40fdd8c7c73f10257d# Parent  e771c3fd999217c8a3e3f9e43151b8dcce7eae69
Merge.

diff -r b02a5d2af40b -r c93bcd9bf89c policymanagement/policyengine/policyengineclient/src/Contexts.cpp
--- a/policymanagement/policyengine/policyengineclient/src/Contexts.cpp	Sun Mar 28 16:37:58 2010 +0100
+++ b/policymanagement/policyengine/policyengineclient/src/Contexts.cpp	Tue Mar 30 13:00:58 2010 +0100
@@ -311,7 +311,7 @@
 		delete operator[](i);
 	}
 
-	RArray::Close();
+	RArray<HBufC8*>::Close();
 }
 
 void RElementIdArray::SetListL( const TDesC8& aChilds)
diff -r b02a5d2af40b -r c93bcd9bf89c policymanagement/policyengine/policyengineserver/src/PolicyProcessor.cpp
--- a/policymanagement/policyengine/policyengineserver/src/PolicyProcessor.cpp	Sun Mar 28 16:37:58 2010 +0100
+++ b/policymanagement/policyengine/policyengineserver/src/PolicyProcessor.cpp	Tue Mar 30 13:00:58 2010 +0100
@@ -55,8 +55,8 @@
 	container->iAttributeType = aAttributeTypes; 
 
 	//append to list
-	RArray::AppendL( container);
-		
+	RArray<AttributeContainerHelper::TContainer*>::AppendL( container);
+			
 	//remove from cleanup
 	CleanupStack::Pop( 2, aAttribute);
 }
@@ -75,7 +75,7 @@
 		delete container;
 	}
 	
-	RArray::Close();
+	RArray<AttributeContainerHelper::TContainer*>::Close();
 }