diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 18:43:21 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 18:43:21 +0000 |
| commit | 535bcdb4957b8d2fd3fdabc01d7fdf478b7b14d2 (patch) | |
| tree | 25ec3c04370a265e565ebaa8981b109653dfa32e /comphelper | |
| parent | 6d5135a775df5e24c1a937e3ce5bab1b934293a3 (diff) | |
INTEGRATION: CWS geordi2q14 (1.5.58); FILE MERGED
2004/01/29 12:46:22 hr 1.5.58.1: #111934#: merge CWS ooo111fix2
Diffstat (limited to 'comphelper')
| -rw-r--r-- | comphelper/inc/comphelper/IdPropArrayHelper.hxx | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/comphelper/inc/comphelper/IdPropArrayHelper.hxx b/comphelper/inc/comphelper/IdPropArrayHelper.hxx index 5918ea660cd0..9659146ac043 100644 --- a/comphelper/inc/comphelper/IdPropArrayHelper.hxx +++ b/comphelper/inc/comphelper/IdPropArrayHelper.hxx @@ -2,9 +2,9 @@ * * $RCSfile: IdPropArrayHelper.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: hr $ $Date: 2003-07-16 17:26:54 $ + * last change: $Author: hr $ $Date: 2004-02-02 19:43:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -129,8 +129,6 @@ namespace comphelper }; //------------------------------------------------------------------ -// 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; @@ -139,7 +137,6 @@ namespace comphelper template<class TYPE> ::osl::Mutex OIdPropertyArrayUsageHelper< TYPE >::s_aMutex; -#endif //------------------------------------------------------------------ template <class TYPE> OIdPropertyArrayUsageHelper<TYPE>::OIdPropertyArrayUsageHelper() |