User: vg Date: 2007/03/26 07:01:14 Modified: dba/connectivity/source/inc/OSubComponent.hxx
Log: INTEGRATION: CWS mingwport03 (1.9.168); FILE MERGED 2006/09/07 10:22:09 vg 1.9.168.1: #i53572# MinGW port File Changes: Directory: /dba/connectivity/source/inc/ ======================================== File [changed]: OSubComponent.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/inc/OSubComponent.hxx?r1=1.9&r2=1.10 Delta lines: +3 -2 ------------------- --- OSubComponent.hxx 8 Sep 2005 06:37:56 -0000 1.9 +++ OSubComponent.hxx 26 Mar 2007 14:01:11 -0000 1.10 @@ -83,13 +83,14 @@ protected: void dispose_ChildImpl() { - ::osl::MutexGuard aGuard( m_pDerivedImplementation->rBHelper.rMutex ); + // avoid ambiguity + ::osl::MutexGuard aGuard( m_pDerivedImplementation->WEAK::rBHelper.rMutex ); m_xParent = NULL; } void relase_ChildImpl() { ::connectivity::release(m_pDerivedImplementation->m_refCount, - m_pDerivedImplementation->rBHelper, + m_pDerivedImplementation->WEAK::rBHelper, m_xParent, m_pDerivedImplementation); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
