Mercurial Mercurial > oss > FCL > sf > mw > imsrv / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Catchup to latest Symbian^4 GCC_SURGE
authorWilliam Roberts <williamr@symbian.org>
Thu, 22 Jul 2010 16:37:10 +0100
branchGCC_SURGE
changeset 39 60521bbb1b72
parent 36 4d2d69762e13 (diff)
parent 26 f4f0635530ce (current diff)
Catchup to latest Symbian^4
--- a/imservices/imfeatureplugin/srcimdatamodel/group/imdatamodel.mmp	Fri Jun 11 13:59:20 2010 +0300
+++ b/imservices/imfeatureplugin/srcimdatamodel/group/imdatamodel.mmp	Thu Jul 22 16:37:10 2010 +0100
@@ -71,7 +71,7 @@
 
 //EXPORTUNFROZEN
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../../eabi/ 
 #elif defined ( WINSCW )
 deffile ../../bwins/ 
--- a/imservices/imfeatureplugin/srcimdatamodel/group/imdatamodelhook.mmp	Fri Jun 11 13:59:20 2010 +0300
+++ b/imservices/imfeatureplugin/srcimdatamodel/group/imdatamodelhook.mmp	Thu Jul 22 16:37:10 2010 +0100
@@ -52,7 +52,7 @@
 LIBRARY                 ecom.lib
 
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../../eabi/ 
 #elif defined ( WINSCW )
 deffile ../../bwins/ 
--- a/imservices/imfeatureplugin/srcimfrontend/group/imecomhook.mmp	Fri Jun 11 13:59:20 2010 +0300
+++ b/imservices/imfeatureplugin/srcimfrontend/group/imecomhook.mmp	Thu Jul 22 16:37:10 2010 +0100
@@ -54,7 +54,7 @@
 
 
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../../eabi/ 
 #elif defined ( WINSCW )
 deffile ../../bwins/ 
--- a/imservices/imfeatureplugin/srcimfrontend/group/immanager.mmp	Fri Jun 11 13:59:20 2010 +0300
+++ b/imservices/imfeatureplugin/srcimfrontend/group/immanager.mmp	Thu Jul 22 16:37:10 2010 +0100
@@ -67,7 +67,7 @@
 //EXPORTUNFROZEN
 
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../../eabi/ 
 #elif defined ( WINSCW )
 deffile ../../bwins/ 
--- a/imservices/imfeatureplugin/srcimoperations/group/imoperation.mmp	Fri Jun 11 13:59:20 2010 +0300
+++ b/imservices/imfeatureplugin/srcimoperations/group/imoperation.mmp	Thu Jul 22 16:37:10 2010 +0100
@@ -73,7 +73,7 @@
 //EXPORTUNFROZEN
 
                
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../../eabi/ 
 #elif defined ( WINSCW )
 deffile ../../bwins/ 
--- a/imservices/imfeatureplugin/srcimoperations/group/imoperationshook.mmp	Fri Jun 11 13:59:20 2010 +0300
+++ b/imservices/imfeatureplugin/srcimoperations/group/imoperationshook.mmp	Thu Jul 22 16:37:10 2010 +0100
@@ -54,7 +54,7 @@
 LIBRARY                 ecom.lib
 
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../../eabi/ 
 #elif defined ( WINSCW )
 deffile ../../bwins/ 
--- a/imservices/imfeatureplugin/srcimprocessor/group/improcessor.mmp	Fri Jun 11 13:59:20 2010 +0300
+++ b/imservices/imfeatureplugin/srcimprocessor/group/improcessor.mmp	Thu Jul 22 16:37:10 2010 +0100
@@ -63,7 +63,7 @@
 
 //EXPORTUNFROZEN
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../../eabi/ 
 #elif defined ( WINSCW )
 deffile ../../bwins/ 
--- a/imservices/imfeatureplugin/srcimprocessor/group/improcessorhook.mmp	Fri Jun 11 13:59:20 2010 +0300
+++ b/imservices/imfeatureplugin/srcimprocessor/group/improcessorhook.mmp	Thu Jul 22 16:37:10 2010 +0100
@@ -54,7 +54,7 @@
 LIBRARY                 ecom.lib
 
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../../eabi/ 
 #elif defined ( WINSCW )
 deffile ../../bwins/ 
--- a/imservices/searchfeatureplugin/srcsearchdatamodel/group/searchdatamodel.mmp	Fri Jun 11 13:59:20 2010 +0300
+++ b/imservices/searchfeatureplugin/srcsearchdatamodel/group/searchdatamodel.mmp	Thu Jul 22 16:37:10 2010 +0100
@@ -67,7 +67,7 @@
 LIBRARY         		flogger.lib
 
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../../eabi/ 
 #elif defined ( WINSCW )
 deffile ../../bwins/ 
--- a/imservices/searchfeatureplugin/srcsearchdatamodel/group/searchdatamodelhook.mmp	Fri Jun 11 13:59:20 2010 +0300
+++ b/imservices/searchfeatureplugin/srcsearchdatamodel/group/searchdatamodelhook.mmp	Thu Jul 22 16:37:10 2010 +0100
@@ -52,7 +52,7 @@
 LIBRARY                 ecom.lib
 
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../../eabi/ 
 #elif defined ( WINSCW )
 deffile ../../bwins/ 
--- a/imservices/searchfeatureplugin/srcsearchfrontend/group/searchecomhook.mmp	Fri Jun 11 13:59:20 2010 +0300
+++ b/imservices/searchfeatureplugin/srcsearchfrontend/group/searchecomhook.mmp	Thu Jul 22 16:37:10 2010 +0100
@@ -54,7 +54,7 @@
 
 
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../../eabi/ 
 #elif defined ( WINSCW )
 deffile ../../bwins/ 
--- a/imservices/searchfeatureplugin/srcsearchfrontend/group/searchmanager.mmp	Fri Jun 11 13:59:20 2010 +0300
+++ b/imservices/searchfeatureplugin/srcsearchfrontend/group/searchmanager.mmp	Thu Jul 22 16:37:10 2010 +0100
@@ -67,7 +67,7 @@
 //EXPORTUNFROZEN
 
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../../eabi/ 
 #elif defined ( WINSCW )
 deffile ../../bwins/ 
--- a/imservices/searchfeatureplugin/srcsearchoperations/group/searchoperation.mmp	Fri Jun 11 13:59:20 2010 +0300
+++ b/imservices/searchfeatureplugin/srcsearchoperations/group/searchoperation.mmp	Thu Jul 22 16:37:10 2010 +0100
@@ -74,7 +74,7 @@
 LIBRARY                 flogger.lib 
 
                
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../../eabi/ 
 #elif defined ( WINSCW )
 deffile ../../bwins/ 
--- a/imservices/searchfeatureplugin/srcsearchoperations/group/searchoperationshook.mmp	Fri Jun 11 13:59:20 2010 +0300
+++ b/imservices/searchfeatureplugin/srcsearchoperations/group/searchoperationshook.mmp	Thu Jul 22 16:37:10 2010 +0100
@@ -54,7 +54,7 @@
 LIBRARY                 ecom.lib
 
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../../eabi/ 
 #elif defined ( WINSCW )
 deffile ../../bwins/ 
--- a/imservices/searchfeatureplugin/srcsearchprocessor/group/searchprocessor.mmp	Fri Jun 11 13:59:20 2010 +0300
+++ b/imservices/searchfeatureplugin/srcsearchprocessor/group/searchprocessor.mmp	Thu Jul 22 16:37:10 2010 +0100
@@ -64,7 +64,7 @@
 
 //EXPORTUNFROZEN
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../../eabi/ 
 #elif defined ( WINSCW )
 deffile ../../bwins/ 
--- a/imservices/searchfeatureplugin/srcsearchprocessor/group/searchprocessorhook.mmp	Fri Jun 11 13:59:20 2010 +0300
+++ b/imservices/searchfeatureplugin/srcsearchprocessor/group/searchprocessorhook.mmp	Thu Jul 22 16:37:10 2010 +0100
@@ -54,7 +54,7 @@
 LIBRARY                 ecom.lib
 
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../../eabi/ 
 #elif defined ( WINSCW )
 deffile ../../bwins/ 
--- a/ximpfw/presence/eabi/presencedatamodelu.def	Fri Jun 11 13:59:20 2010 +0300
+++ b/ximpfw/presence/eabi/presencedatamodelu.def	Thu Jul 22 16:37:10 2010 +0100
@@ -226,7 +226,7 @@
 	_ZTI38CGroupMembersPresenceConfigurationItem @ 225 NONAME ; #<TI>#
 	_ZTI47CPresentityGroupMembersPresenceSubscriptionItem @ 226 NONAME ; #<TI>#
 	_ZTIN20CPresenceFilterStore27CPresenceFilterStoreMappingE @ 227 NONAME ; #<TI>#
-	_ZTIN22CPresenceInfoFilterImp12CFilterFieldE @ 228 NONAME ; #<TI>#
+	_ZTIN22CPresenceInfoFilterImp12CFilterFieldE @ 228 NONAME ABSENT ; #<TI>#
 	_ZTV18CPresenceDataCache @ 229 NONAME ; #<VT>#
 	_ZTV20CPresenceFilterStore @ 230 NONAME ; #<VT>#
 	_ZTV25CPresenceObjectFactoryImp @ 231 NONAME ; #<VT>#
@@ -242,6 +242,6 @@
 	_ZTV38CGroupMembersPresenceConfigurationItem @ 241 NONAME ; #<VT>#
 	_ZTV47CPresentityGroupMembersPresenceSubscriptionItem @ 242 NONAME ; #<VT>#
 	_ZTVN20CPresenceFilterStore27CPresenceFilterStoreMappingE @ 243 NONAME ; #<VT>#
-	_ZTVN22CPresenceInfoFilterImp12CFilterFieldE @ 244 NONAME ; #<VT>#
-	_ZThn4_NK21CPresenceBuddyInfoImp14EqualsIdentityEPK18MPresenceBuddyInfo @ 245 NONAME ; #<thunk>#
+	_ZTVN22CPresenceInfoFilterImp12CFilterFieldE @ 244 NONAME ABSENT ; #<VT>#
+	_ZThn4_NK21CPresenceBuddyInfoImp14EqualsIdentityEPK18MPresenceBuddyInfo @ 245 NONAME ABSENT ; #<thunk>#
 
--- a/ximpfw/presence/group/presencecacheclient.mmp	Fri Jun 11 13:59:20 2010 +0300
+++ b/ximpfw/presence/group/presencecacheclient.mmp	Thu Jul 22 16:37:10 2010 +0100
@@ -52,7 +52,7 @@
 LIBRARY                 presencedatamodel.lib
 LIBRARY                 ximpdatamodel.lib
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../eabi/ 
 #elif defined ( WINSCW )
 deffile ../bwins/ 
--- a/ximpfw/presence/group/presencecacheecomhook.mmp	Fri Jun 11 13:59:20 2010 +0300
+++ b/ximpfw/presence/group/presencecacheecomhook.mmp	Thu Jul 22 16:37:10 2010 +0100
@@ -50,7 +50,7 @@
 LIBRARY                 presencecacheclient.lib
 LIBRARY                 ecom.lib
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../eabi/ 
 #elif defined ( WINSCW )
 deffile ../bwins/ 
--- a/ximpfw/presence/group/presencedatamodelhook.mmp	Fri Jun 11 13:59:20 2010 +0300
+++ b/ximpfw/presence/group/presencedatamodelhook.mmp	Thu Jul 22 16:37:10 2010 +0100
@@ -53,7 +53,7 @@
 LIBRARY                 presencedatamodel.lib
 LIBRARY                 ecom.lib
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../eabi/ 
 #elif defined ( WINSCW )
 deffile ../bwins/ 
--- a/ximpfw/presence/group/presenceecomhook.mmp	Fri Jun 11 13:59:20 2010 +0300
+++ b/ximpfw/presence/group/presenceecomhook.mmp	Thu Jul 22 16:37:10 2010 +0100
@@ -53,7 +53,7 @@
 LIBRARY                 presencemanager.lib
 LIBRARY                 ecom.lib
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../eabi/ 
 #elif defined ( WINSCW )
 deffile ../bwins/ 
--- a/ximpfw/presence/group/presencemanager.mmp	Fri Jun 11 13:59:20 2010 +0300
+++ b/ximpfw/presence/group/presencemanager.mmp	Thu Jul 22 16:37:10 2010 +0100
@@ -66,7 +66,7 @@
 LIBRARY                 presencedatamodel.lib
 LIBRARY                 ximpsrvclient.lib
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../eabi/ 
 #elif defined ( WINSCW )
 deffile ../bwins/
FCL/sf/mw/imsrv