# HG changeset patch
# User Sebastian Brannstrom <sebastianb@symbian.org>
# Date 1276606493 -3600
# Node ID 4c8d5d006ed150ca8739bb1855001d9dde77d76f
# Parent  ac6f1965a798d807805c83023855229c8db8f6ed
Bug 2937 - GCC compilation issue fixes

diff -r ac6f1965a798 -r 4c8d5d006ed1 connectivitymodules/SeCon/services/pcd/src/sconmetadata.cpp
--- a/connectivitymodules/SeCon/services/pcd/src/sconmetadata.cpp	Fri Jun 11 16:23:33 2010 +0100
+++ b/connectivitymodules/SeCon/services/pcd/src/sconmetadata.cpp	Tue Jun 15 13:54:53 2010 +0100
@@ -1037,7 +1037,7 @@
 			seconds = numer/denom;
 			}
 		}
-	_LIT(KFormat, "%.0f°%.0f'%.2f\"" );
+	_LIT(KFormat, "%.0f\xB0%.0f'%.2f\"" );
 	aPosDegrees.Format( KFormat, degrees, minutes, seconds );
 	TRACE_FUNC_EXIT;
 	return KErrNone;
diff -r ac6f1965a798 -r 4c8d5d006ed1 omads/omadsextensions/adapters/agenda/src/nsmlagendadatastore.cpp
--- a/omads/omadsextensions/adapters/agenda/src/nsmlagendadatastore.cpp	Fri Jun 11 16:23:33 2010 +0100
+++ b/omads/omadsextensions/adapters/agenda/src/nsmlagendadatastore.cpp	Tue Jun 15 13:54:53 2010 +0100
@@ -61,7 +61,7 @@
 // -----------------------------------------------------------------------------
 //
 CNSmlAgendaDataStore::CNSmlAgendaDataStore() :
-	iKey( TKeyArrayFix( _FOFF( TNSmlSnapshotItem, ItemId() ), ECmpTInt ) ),
+	iKey( TKeyArrayFix( _FOFF_DYNAMIC( TNSmlSnapshotItem, ItemId() ), ECmpTInt ) ),
 	iPos( -1 ),
 	iHasHistory( EFalse ),
 	iModificationCount( KNSmlCompactAfterChanges ),
diff -r ac6f1965a798 -r 4c8d5d006ed1 omads/omadsextensions/adapters/contacts/src/NSmlContactsDataStore.cpp
--- a/omads/omadsextensions/adapters/contacts/src/NSmlContactsDataStore.cpp	Fri Jun 11 16:23:33 2010 +0100
+++ b/omads/omadsextensions/adapters/contacts/src/NSmlContactsDataStore.cpp	Tue Jun 15 13:54:53 2010 +0100
@@ -81,7 +81,7 @@
 // ----------------------------------------------------------------------------
 // CNSmlContactsDataStore::CNSmlContactsDataStore() 
 // ----------------------------------------------------------------------------
-EXPORT_C CNSmlContactsDataStore::CNSmlContactsDataStore() : iKey( TKeyArrayFix( _FOFF( TNSmlSnapshotItem,ItemId() ),ECmpTInt ))
+EXPORT_C CNSmlContactsDataStore::CNSmlContactsDataStore() : iKey( TKeyArrayFix( _FOFF_DYNAMIC( TNSmlSnapshotItem,ItemId() ),ECmpTInt ))
 	{
 	_DBG_FILE("CNSmlContactsDataStore::CNSmlContactsDataStore(): begin");
 	iSyncHistory = EFalse;
diff -r ac6f1965a798 -r 4c8d5d006ed1 omads/omadsextensions/adapters/notes/src/NSmlNotepadDataStore.cpp
--- a/omads/omadsextensions/adapters/notes/src/NSmlNotepadDataStore.cpp	Fri Jun 11 16:23:33 2010 +0100
+++ b/omads/omadsextensions/adapters/notes/src/NSmlNotepadDataStore.cpp	Tue Jun 15 13:54:53 2010 +0100
@@ -126,7 +126,7 @@
 // ----------------------------------------------------------------------------
 // CNSmlNotepadDataStore::CNSmlNotepadDataStore() 
 // ----------------------------------------------------------------------------
-CNSmlNotepadDataStore::CNSmlNotepadDataStore() : iOpenedStoreId(KNSmlNotepadAdapterImplUid),iKey( TKeyArrayFix( _FOFF( TNSmlSnapshotItem,ItemId() ),ECmpTInt ))
+CNSmlNotepadDataStore::CNSmlNotepadDataStore() : iOpenedStoreId(KNSmlNotepadAdapterImplUid),iKey( TKeyArrayFix( _FOFF_DYNAMIC( TNSmlSnapshotItem,ItemId() ),ECmpTInt ))
 	{
 	_NOTEPAD_DBG_FILE("CNSmlNotepadDataStore::CNSmlNotepadDataStore(): begin");
 	iSyncHistory = EFalse;