# HG changeset patch # User Peter Fordham # Date 1274662498 25200 # Node ID 4b9f782dce8f57c9fa291aaaebddd4c67296a43a # Parent b0e374890c7b5a1b3c665d1da4778474ceee80ea Bug 1782 - GCC-E compilation error. Make friends with whole classes instead of private and protected methods. diff -r b0e374890c7b -r 4b9f782dce8f accessoryservices/accessoryserver/inc/ASYProxy/ASYProxy.h --- a/accessoryservices/accessoryserver/inc/ASYProxy/ASYProxy.h Sun Mar 28 16:38:55 2010 +0100 +++ b/accessoryservices/accessoryserver/inc/ASYProxy/ASYProxy.h Sun May 23 17:54:58 2010 -0700 @@ -180,8 +180,7 @@ public: // Friend classes - friend void CASYProxyAsyLoader::DoIssueRequestL(); - friend void CASYProxyAsyLoader::ArrangeImplementationsL(); + friend class CASYProxyAsyLoader; protected: // Friend classes diff -r b0e374890c7b -r 4b9f782dce8f accessoryservices/accessoryserver/inc/ASYProxy/ASYProxyAsyLoader.h --- a/accessoryservices/accessoryserver/inc/ASYProxy/ASYProxyAsyLoader.h Sun Mar 28 16:38:55 2010 +0100 +++ b/accessoryservices/accessoryserver/inc/ASYProxy/ASYProxyAsyLoader.h Sun May 23 17:54:58 2010 -0700 @@ -154,7 +154,7 @@ public: // Friend classes - friend void CASYProxyLoaderTimer::RunL(); + friend class CASYProxyLoaderTimer; protected: // Friend classes diff -r b0e374890c7b -r 4b9f782dce8f accessoryservices/accessoryserver/src/accpolaudiodevicetopology/accpolselectorunit.cpp --- a/accessoryservices/accessoryserver/src/accpolaudiodevicetopology/accpolselectorunit.cpp Sun Mar 28 16:38:55 2010 +0100 +++ b/accessoryservices/accessoryserver/src/accpolaudiodevicetopology/accpolselectorunit.cpp Sun May 23 17:54:58 2010 -0700 @@ -122,7 +122,7 @@ EXPORT_C CAccPolSelectorUnit::~CAccPolSelectorUnit() { API_TRACE_( "[AccFW: ACCPOLAUDIODEVICETOPOLOGY] CAccPolSelectorUnit::~CAccPolSelectorUnit() - Enter" ); - API_TRACE_( "[AccFW: ACCPOLAUDIODEVICETOPOLOGY] CAccPolSelectorUnit::¨CAccPolSelectorUnit() - Return" ); + API_TRACE_( "[AccFW: ACCPOLAUDIODEVICETOPOLOGY] CAccPolSelectorUnit::~CAccPolSelectorUnit() - Return" ); } // ---------------------------------------------------------------------------