--- a/locationmanager/locationtrail/src/ctracklog.cpp	Mon Mar 15 12:42:24 2010 +0200
+++ b/locationmanager/locationtrail/src/ctracklog.cpp	Wed Mar 31 22:19:07 2010 +0300
@@ -137,7 +137,7 @@
 	}
 
 void CTrackLog::LocationAdded( const TLocationTrailItem& aTrailItem, 
-							   const TPositionSatelliteInfo& aSatellites ) __SOFTFP
+							   const TPositionSatelliteInfo& aSatellites )
 	{
 	LOG("CTrackLog::LocationAdded start");
 
@@ -230,8 +230,8 @@
 			{
 			User::Leave( err );
 			}
-		writer << I64LOW( iTagId );
-		writer << I64HIGH( iTagId ); // Causes compiler warning due to misinterpretation by compiler parser
+		writer << I64LOW( static_cast<TUint64>(iTagId) );
+		writer << I64HIGH( static_cast<TUint64>(iTagId) );
 		}
 	else 
 		{