# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1284701996 -10800 # Node ID 7521e5afd3df379289cd0712b75218da46b1f264 # Parent 826b40dcb0a825a4b13581689397442005e20c41 Revision: 201037 Kit: 201037 diff -r 826b40dcb0a8 -r 7521e5afd3df persistentstorage/sql/SRC/Server/SqlSrvStatement.inl --- a/persistentstorage/sql/SRC/Server/SqlSrvStatement.inl Thu Sep 02 22:18:45 2010 +0300 +++ b/persistentstorage/sql/SRC/Server/SqlSrvStatement.inl Fri Sep 17 08:39:56 2010 +0300 @@ -88,7 +88,12 @@ iBuf->ResizeL(aData.Length()); iBuf->Write(0, aData); //If the size is 0, then return KNullDesC8, where an empty string is hold, not a null one ("" instead of NULL) - return iBuf->Size() == 0 ? KNullDesC8() : iBuf->Ptr(0); + // was return iBuf->Size() == 0 ? KNullDesC8() : iBuf->Ptr(0); + if (iBuf->Size() == 0) + { + return KNullDesC8(); + } + return iBuf->Ptr(0); } /** @@ -102,7 +107,12 @@ { __ASSERT_DEBUG(iBuf != NULL, __SQLPANIC(ESqlPanicInvalidObj)); //If the size is 0, then return KNullDesC8, where an empty string is hold, not a null one ("" instead of NULL) - return iBuf->Size() == 0 ? KNullDesC8() : iBuf->Ptr(0); + // was return iBuf->Size() == 0 ? KNullDesC8() : iBuf->Ptr(0); + if (iBuf->Size() == 0) + { + return KNullDesC8(); + } + return iBuf->Ptr(0); } /**