diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 16:49:41 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 16:49:41 +0000 |
| commit | a35b33333da574aa6e9c20caf29ceb23e625ffd9 (patch) | |
| tree | 0fd189d53cf19862bccb29afedcae9e7f018c316 /cppuhelper | |
| parent | 8fa3811df70f72391b987c12ff45d07942591528 (diff) | |
INTEGRATION: CWS ooo11rc2 (1.9.16); FILE MERGED
2003/07/14 15:18:47 fa 1.9.16.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
Diffstat (limited to 'cppuhelper')
| -rw-r--r-- | cppuhelper/inc/cppuhelper/implbase.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cppuhelper/inc/cppuhelper/implbase.hxx b/cppuhelper/inc/cppuhelper/implbase.hxx index 14d43012e540..1101b8cc1c5e 100644 --- a/cppuhelper/inc/cppuhelper/implbase.hxx +++ b/cppuhelper/inc/cppuhelper/implbase.hxx @@ -2,9 +2,9 @@ * * $RCSfile: implbase.hxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: dbo $ $Date: 2001-12-13 17:35:52 $ + * last change: $Author: hr $ $Date: 2003-07-16 17:49:41 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -330,7 +330,7 @@ ClassData##N WeakAggImplHelper##N< __IFC##N >::s_aCD = ClassData##N( 2 ); // The Mac OS X gcc compiler cannot handle assignments to static data members // of the generic template class. It can only handle assignments to specific // instantiations of a template class. -#ifdef MACOSX +#if defined( MACOSX ) && ( __GNUC__ < 3 ) /** Implementation helper macro: have a look at __DEF_IMPLHELPER_PRE @internal */ |