diff -r 866b4af7ffbe -r 4dc88a4ac6f4 mtpdataproviders/mtpfileandfolderdp/src/cmtpfiledp.cpp --- a/mtpdataproviders/mtpfileandfolderdp/src/cmtpfiledp.cpp Tue Sep 28 20:14:08 2010 +0800 +++ b/mtpdataproviders/mtpfileandfolderdp/src/cmtpfiledp.cpp Fri Oct 15 15:05:57 2010 +0800 @@ -209,19 +209,24 @@ } OstTraceFunctionExit0( CMTPFILEDATAPROVIDER_SUPPORTED_EXIT ); } - + +#ifdef OST_TRACE_COMPILER_IN_USE void CMTPFileDataProvider::NotifyEnumerationCompleteL(TUint32 aStorageId, TInt aError) +#else +void CMTPFileDataProvider::NotifyEnumerationCompleteL(TUint32 aStorageId, TInt /*aError*/) +#endif { OstTraceFunctionEntry0( CMTPFILEDATAPROVIDER_NOTIFYENUMERATIONCOMPLETEL_ENTRY ); OstTraceExt2( TRACE_NORMAL, CMTPFILEDATAPROVIDER_NOTIFYENUMERATIONCOMPLETEL, "Enumeration of storage 0x%08X completed with error status %d", aStorageId, (TInt32)aError); + aStorageId = aStorageId; __ASSERT_DEBUG((aStorageId == iPendingEnumerations[KActiveEnumeration]), User::Invariant()); Framework().ObjectEnumerationCompleteL(iPendingEnumerations[KActiveEnumeration]); iPendingEnumerations.Remove(KActiveEnumeration); OstTraceFunctionExit0( CMTPFILEDATAPROVIDER_NOTIFYENUMERATIONCOMPLETEL_EXIT ); } - + /** Standard C++ constructor */