--- a/persistentstorage/sql/SRC/Server/SqlSrvMain.h Tue Jul 06 16:18:30 2010 +0300
+++ b/persistentstorage/sql/SRC/Server/SqlSrvMain.h Wed Aug 18 11:30:17 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-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"
@@ -17,7 +17,7 @@
#define __SQLSRVMAIN_H__
#include <f32file.h>
-#include "SqlPanic.h" //TSqlPanic
+#include "SqlAssert.h" //TSqlPanic
#include "SqlSrvFileData.h" //TSqlSrvFileData
#include "SqlSrvAuthorizer.h" //MSqlPolicyInspector
#include "SqlSrvSecurityMap.h" //
@@ -90,6 +90,7 @@
void GetCollationDllNameL();
void CacheDbConfigFileNamesL(RFs& aFs, const TDesC& aServerPrivatePath);
TInt ReAllocBuf(TInt aNewBufSize);
+ void DeleteTempFilesL(TInt aDriveNumber, const TDesC& aServerPrivatePath) const;
private:
TSqlSrvFileData iFileData; //Used as a temporary storage for file data (file name, drive, path, secure uid)
@@ -162,7 +163,7 @@
*/
inline CSqlCompactor& CSqlServer::Compactor()
{
- __SQLASSERT(iCompactor != NULL, ESqlPanicInternalError);
+ __ASSERT_DEBUG(iCompactor != NULL, __SQLPANIC(ESqlPanicInternalError));
return *iCompactor;
}