diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 16:26:54 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 16:26:54 +0000 |
| commit | b28741fc57f5ced346ae195fbce760053d285b42 (patch) | |
| tree | 4ac0c5629e05744da625eef6fdc4f03cfc0b19ab /comphelper | |
| parent | b3f70edc3343e542084a3f3cc5244986e4369cd3 (diff) | |
INTEGRATION: CWS ooo11rc2 (1.4.102); FILE MERGED
2003/07/14 15:41:11 fa 1.4.102.1: Conditionalize OS X + gcc 2.95 hacks for gcc 2.95 only.
http://www.openoffice.org/project/www/issues/show_bug.cgi?id=16695
Dan
fa@ooo
Diffstat (limited to 'comphelper')
| -rw-r--r-- | comphelper/inc/comphelper/IdPropArrayHelper.hxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/comphelper/inc/comphelper/IdPropArrayHelper.hxx b/comphelper/inc/comphelper/IdPropArrayHelper.hxx index 52e0658e7c57..5918ea660cd0 100644 --- a/comphelper/inc/comphelper/IdPropArrayHelper.hxx +++ b/comphelper/inc/comphelper/IdPropArrayHelper.hxx @@ -2,9 +2,9 @@ * * $RCSfile: IdPropArrayHelper.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: jl $ $Date: 2001-03-22 13:28:36 $ + * last change: $Author: hr $ $Date: 2003-07-16 17:26:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -129,7 +129,8 @@ namespace comphelper }; //------------------------------------------------------------------ -#ifndef MACOSX +// do NOT compile these on Mac OS X with gcc 2.95, but DO compile for all others +#if !defined( MACOSX ) || (defined(MACOSX) && (__GNUC__ >= 3)) template<class TYPE> sal_Int32 OIdPropertyArrayUsageHelper< TYPE >::s_nRefCount = 0; @@ -138,7 +139,7 @@ namespace comphelper template<class TYPE> ::osl::Mutex OIdPropertyArrayUsageHelper< TYPE >::s_aMutex; -#endif MACOSX +#endif //------------------------------------------------------------------ template <class TYPE> OIdPropertyArrayUsageHelper<TYPE>::OIdPropertyArrayUsageHelper() |