diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 16:52:00 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 16:52:00 +0000 |
| commit | 927e9697a0df177578ac7c9e237997358e272724 (patch) | |
| tree | 6c0146849e3c564cdd27aa96c82467e3420b8422 | |
| parent | c8b33cfbcdafd11327ed2e66c68c12780d4c6a7b (diff) | |
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
| -rw-r--r-- | cppuhelper/source/factory.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx index 14b8e1ab864c..ff560224c442 100644 --- a/cppuhelper/source/factory.cxx +++ b/cppuhelper/source/factory.cxx @@ -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 |