Merge.
--- 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)
--- 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();
}