INTEGRATION: CWS ooo11rc2 (1.18.12); FILE MERGED

2003/07/14 15:18:56 fa 1.18.12.1: Conditionalize OS X + gcc 2.95 hacks for gcc 2.95 only.

http://www.openoffice.org/project/www/issues/show_bug.cgi?id=16611

Dan
fa@ooo
This commit is contained in:
Jens-Heiner Rechtien 2003-07-16 16:52:00 +00:00
parent c8b33cfbcd
commit 927e9697a0

View file

@ -2,9 +2,9 @@
*
* $RCSfile: factory.cxx,v $
*
* $Revision: 1.18 $
* $Revision: 1.19 $
*
* last change: $Author: rt $ $Date: 2003-04-23 16:24:33 $
* last change: $Author: hr $ $Date: 2003-07-16 17:52:00 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -883,7 +883,7 @@ sal_Bool SAL_CALL ORegistryFactoryHelper::releaseOnNotification() throw(::com::s
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
#if defined(MACOSX)
#if defined( MACOSX ) && ( __GNUC__ < 3 )
// Initialize static template data here to break circular reference to libstatic
ClassData3 WeakImplHelper3< XServiceInfo, XSingleServiceFactory, XUnloadingPreference >::s_aCD(3);
#endif