diff -r 28839de615b4 -r 26645d81f48d persistentstorage/sql/SRC/Security/SqlSecurityImpl.cpp
--- a/persistentstorage/sql/SRC/Security/SqlSecurityImpl.cpp	Thu Aug 19 11:36:21 2010 +0300
+++ b/persistentstorage/sql/SRC/Security/SqlSecurityImpl.cpp	Tue Aug 31 16:57:14 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-2010 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"
@@ -43,8 +43,8 @@
 */
 inline CSqlSecurityPolicy::TPolicyItem* CSqlSecurityPolicy::PolicyItemPtr(const RSqlBufFlat::TCell* aBegin, const RSqlBufFlat::TCell* aCurrent)
 	{
-	__SQLASSERT(aBegin != NULL && aCurrent != NULL, ESqlPanicBadArgument);
-	__SQLASSERT(aCurrent->iPos != 0, ESqlPanicBadArgument);
+	__ASSERT_DEBUG(aBegin != NULL && aCurrent != NULL, __SQLPANIC2(ESqlPanicBadArgument));
+	__ASSERT_DEBUG(aCurrent->iPos != 0, __SQLPANIC2(ESqlPanicBadArgument));
 	const TUint8* begin = reinterpret_cast <const TUint8*> (aBegin);
 	return reinterpret_cast <CSqlSecurityPolicy::TPolicyItem*> (const_cast <TUint8*> (begin) + aCurrent->iPos);
 	}
@@ -63,7 +63,7 @@
 																	   		 const TDesC& aObjectName) const
 	{
 	const RSqlBufFlat::TCell* begin = iBufFlat.Header();
-	__SQLASSERT(begin != NULL, ESqlPanicInternalError);
+	__ASSERT_DEBUG(begin != NULL, __SQLPANIC(ESqlPanicInternalError));
 	const RSqlBufFlat::TCell* end = begin + Count();
 	const RSqlBufFlat::TCell* current = begin + CSqlSecurityPolicy::EDbPolicyIdx;//ignore default and database policiy types ("current" points before the first non-database policy)
 	while(++current < end)
@@ -71,8 +71,8 @@
 		if(current->iPos > 0 && current->Type() == (TInt)aObjectType) //if present and the same type as aObjectType
 			{
 			const CSqlSecurityPolicy::TPolicyItem* item = CSqlSecurityPolicy::PolicyItemPtr(begin, current);
-			__SQLASSERT(item != NULL, ESqlPanicInternalError);
-			__SQLASSERT(((current->Size() - sizeof(CSqlSecurityPolicy::TPolicyItem) - sizeof(TInt)) / sizeof(TUint16)) == item->NameSize(), ESqlPanicInternalError);
+			__ASSERT_DEBUG(item != NULL, __SQLPANIC(ESqlPanicInternalError));
+			__ASSERT_DEBUG(((current->Size() - sizeof(CSqlSecurityPolicy::TPolicyItem) - sizeof(TInt)) / sizeof(TUint16)) == item->NameSize(), __SQLPANIC(ESqlPanicInternalError));
 			if(::CompareNoCase16(aObjectName, TPtrC(item->NamePtr(), item->NameSize())) == 0)
 				{
 				return item;	
@@ -147,7 +147,7 @@
 TInt CSqlSecurityPolicy::Count() const
 	{
 	const RSqlBufFlat::TCell* begin = iBufFlat.Header();
-	__SQLASSERT(begin != NULL, ESqlPanicInternalError);
+	__ASSERT_DEBUG(begin != NULL, __SQLPANIC(ESqlPanicInternalError));
 	return *reinterpret_cast <const TInt*> (reinterpret_cast <const TUint8*> (begin) + (begin + CSqlSecurityPolicy::ECountIdx)->iPos);
 	}
 
@@ -156,9 +156,9 @@
 */
 void CSqlSecurityPolicy::SetCount(TInt aCount)
 	{
-	__SQLASSERT(aCount >= 0, ESqlPanicBadArgument);
+	__ASSERT_DEBUG(aCount >= 0, __SQLPANIC(ESqlPanicBadArgument));
 	RSqlBufFlat::TCell* begin = iBufFlat.Header();
-	__SQLASSERT(begin != NULL, ESqlPanicInternalError);
+	__ASSERT_DEBUG(begin != NULL, __SQLPANIC(ESqlPanicInternalError));
 	*reinterpret_cast <TInt*> (reinterpret_cast <TUint8*> (begin) + (begin + CSqlSecurityPolicy::ECountIdx)->iPos) = aCount;
 	}
 
@@ -168,9 +168,9 @@
 void CSqlSecurityPolicy::SetDefaultPolicy(const TSecurityPolicy& aPolicy)
 	{
 	RSqlBufFlat::TCell* begin = iBufFlat.Header();
-	__SQLASSERT(begin != NULL, ESqlPanicInternalError);
+	__ASSERT_DEBUG(begin != NULL, __SQLPANIC(ESqlPanicInternalError));
 	CSqlSecurityPolicy::TPolicyItem* item = CSqlSecurityPolicy::PolicyItemPtr(begin, begin + CSqlSecurityPolicy::EDefaultPolicyIdx);
-	__SQLASSERT(item != NULL, ESqlPanicInternalError);
+	__ASSERT_DEBUG(item != NULL, __SQLPANIC(ESqlPanicInternalError));
 	item->iPolicy[0] = aPolicy;
 	}
 	
@@ -184,11 +184,11 @@
 void CSqlSecurityPolicy::SetDbPolicy(RSqlSecurityPolicy::TPolicyType aPolicyType, const TSecurityPolicy& aPolicy)
 	{
 	const TInt KPolicyIndex = CSqlSecurityPolicy::PolicyType2Index(aPolicyType);
-	__SQLASSERT((TUint)KPolicyIndex < EPolicyTypeCount, ESqlPanicBadArgument);
+	__ASSERT_DEBUG((TUint)KPolicyIndex < EPolicyTypeCount, __SQLPANIC(ESqlPanicBadArgument));
 	RSqlBufFlat::TCell* begin = iBufFlat.Header();
-	__SQLASSERT(begin != NULL, ESqlPanicInternalError);
+	__ASSERT_DEBUG(begin != NULL, __SQLPANIC(ESqlPanicInternalError));
 	CSqlSecurityPolicy::TPolicyItem* item = CSqlSecurityPolicy::PolicyItemPtr(begin, begin + CSqlSecurityPolicy::EDbPolicyIdx);
-	__SQLASSERT(item != NULL, ESqlPanicInternalError);
+	__ASSERT_DEBUG(item != NULL, __SQLPANIC(ESqlPanicInternalError));
 	//KPolicyIndex value is tested at the beginning of the function
 	//coverity[overrun-local]
 	item->iPolicy[KPolicyIndex] = aPolicy;
@@ -220,8 +220,8 @@
 							   	   RSqlSecurityPolicy::TPolicyType aPolicyType, const TSecurityPolicy& aPolicy)
 	{
 	const TInt KPolicyIndex = CSqlSecurityPolicy::PolicyType2Index(aPolicyType);
-	__SQLASSERT((TUint)KPolicyIndex < EPolicyTypeCount, ESqlPanicBadArgument);
-	__SQLASSERT(aObjectName.Length() > 0, ESqlPanicBadArgument);
+	__ASSERT_DEBUG((TUint)KPolicyIndex < EPolicyTypeCount, __SQLPANIC(ESqlPanicBadArgument));
+	__ASSERT_DEBUG(aObjectName.Length() > 0, __SQLPANIC(ESqlPanicBadArgument));
 	CSqlSecurityPolicy::TPolicyItem* item = const_cast <CSqlSecurityPolicy::TPolicyItem*> (FindPolicyItemPtr(aObjectType, aObjectName));
 	if(item)
 		{//There is a field in the flat buffer for {aObjectType, aObjectName}. Set the policy.
@@ -246,7 +246,7 @@
 	item = reinterpret_cast <CSqlSecurityPolicy::TPolicyItem*> (buf);
 	//coverity[DEADCODE]
 	//The ASSERT might be useful in catching future defect in this function
-	__SQLASSERT(item != NULL, ESqlPanicInternalError);
+	__ASSERT_DEBUG(item != NULL, __SQLPANIC(ESqlPanicInternalError));
 	TSecurityPolicy defaultPolicy = DefaultPolicy();
 	for(TInt i=0;i<CSqlSecurityPolicy::EPolicyTypeCount;++i)
 		{
@@ -273,9 +273,9 @@
 TSecurityPolicy CSqlSecurityPolicy::DefaultPolicy() const
 	{
 	const RSqlBufFlat::TCell* begin = iBufFlat.Header();
-	__SQLASSERT(begin != NULL, ESqlPanicInternalError);
+	__ASSERT_DEBUG(begin != NULL, __SQLPANIC(ESqlPanicInternalError));
 	const CSqlSecurityPolicy::TPolicyItem* item = CSqlSecurityPolicy::PolicyItemPtr(begin, begin + CSqlSecurityPolicy::EDefaultPolicyIdx);
-	__SQLASSERT(item != NULL, ESqlPanicInternalError);
+	__ASSERT_DEBUG(item != NULL, __SQLPANIC(ESqlPanicInternalError));
 	return item->iPolicy[0];
 	}
 	
@@ -292,11 +292,11 @@
 TSecurityPolicy CSqlSecurityPolicy::DbPolicy(RSqlSecurityPolicy::TPolicyType aPolicyType) const
 	{
 	const TInt KPolicyIndex = CSqlSecurityPolicy::PolicyType2Index(aPolicyType);
-	__SQLASSERT((TUint)KPolicyIndex < EPolicyTypeCount, ESqlPanicBadArgument);
+	__ASSERT_DEBUG((TUint)KPolicyIndex < EPolicyTypeCount, __SQLPANIC(ESqlPanicBadArgument));
 	const RSqlBufFlat::TCell* begin = iBufFlat.Header();
-	__SQLASSERT(begin != NULL, ESqlPanicInternalError);
+	__ASSERT_DEBUG(begin != NULL, __SQLPANIC(ESqlPanicInternalError));
 	const CSqlSecurityPolicy::TPolicyItem* item = CSqlSecurityPolicy::PolicyItemPtr(begin, begin + CSqlSecurityPolicy::EDbPolicyIdx);
-	__SQLASSERT(item != NULL, ESqlPanicInternalError);
+	__ASSERT_DEBUG(item != NULL, __SQLPANIC(ESqlPanicInternalError));
 	//KPolicyIndex value is tested at the beginning of the function
 	//coverity[overrun-local]
 	return item->iPolicy[KPolicyIndex];
@@ -324,8 +324,8 @@
 										   const TDesC& aObjectName, RSqlSecurityPolicy::TPolicyType aPolicyType)
 	{
 	const TInt KPolicyIndex = CSqlSecurityPolicy::PolicyType2Index(aPolicyType);
-	__SQLASSERT((TUint)KPolicyIndex < EPolicyTypeCount, ESqlPanicBadArgument);
-	__SQLASSERT(aObjectName.Length() > 0, ESqlPanicBadArgument);
+	__ASSERT_DEBUG((TUint)KPolicyIndex < EPolicyTypeCount, __SQLPANIC(ESqlPanicBadArgument));
+	__ASSERT_DEBUG(aObjectName.Length() > 0, __SQLPANIC(ESqlPanicBadArgument));
 	const CSqlSecurityPolicy::TPolicyItem* item = FindPolicyItemPtr(aObjectType, aObjectName);
 	//KPolicyIndex value is tested at the beginning of the function
 	//coverity[overrun-local]
@@ -377,7 +377,7 @@
 	iEnd(iBegin + aSqlSecurityPolicy.Count()),
 	iCurPolicyIdx(CSqlSecurityPolicy::EPolicyTypeCount)
 	{
-	__SQLASSERT(iBegin != NULL, ESqlPanicInternalError);
+	__ASSERT_DEBUG(iBegin != NULL, __SQLPANIC(ESqlPanicInternalError));
 	}
 	
 /**
@@ -402,7 +402,7 @@
 			}
 		}
 	const CSqlSecurityPolicy::TPolicyItem* item = CSqlSecurityPolicy::PolicyItemPtr(iBegin, iCurrent);
-	__SQLASSERT(item != NULL, ESqlPanicInternalError);
+	__ASSERT_DEBUG(item != NULL, __SQLPANIC(ESqlPanicInternalError));
 	aObjectType = static_cast <RSqlSecurityPolicy::TObjectType> (iCurrent->Type());
 	aPolicyType = static_cast <RSqlSecurityPolicy::TPolicyType> (iCurPolicyIdx);
 	aPolicy = item->iPolicy[iCurPolicyIdx];