diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 22:07:22 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 22:07:22 +0000 |
| commit | b0dc338fcb37bcb5dbf1404459d78ca13fc81a19 (patch) | |
| tree | 3d36826e587f5e17cf5147041ed1691402f48bb8 /cppuhelper | |
| parent | d55f63f02f663a973a5a868cd1c7064a807674c6 (diff) | |
INTEGRATION: CWS geordi2q14 (1.11.40); FILE MERGED
2004/01/29 15:09:04 hr 1.11.40.1: #111934#: merge CWS ooo111fix2
Diffstat (limited to 'cppuhelper')
| -rw-r--r-- | cppuhelper/inc/cppuhelper/compbase.hxx | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/cppuhelper/inc/cppuhelper/compbase.hxx b/cppuhelper/inc/cppuhelper/compbase.hxx index e63405b394c1..a0b78e59c750 100644 --- a/cppuhelper/inc/cppuhelper/compbase.hxx +++ b/cppuhelper/inc/cppuhelper/compbase.hxx @@ -2,9 +2,9 @@ * * $RCSfile: compbase.hxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: hr $ $Date: 2003-07-16 17:47:47 $ + * last change: $Author: hr $ $Date: 2004-02-02 23:07:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -68,8 +68,7 @@ #include <cppuhelper/implbase.hxx> #endif -/* This header should not be used anymore. compbase1-N.hxx use implbase_ex.hxx except - for MACOSX. +/* This header should not be used anymore. @deprecated */ @@ -145,20 +144,10 @@ ClassData##N WeakAggComponentImplHelper##N< __IFC##N >::s_aCD = ClassData##N( 3 #define __DEF_COMPIMPLHELPER_C( N ) \ } //================================================================================================== -// 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. -#if defined(MACOSX) && ( __GNUC__ < 3 ) -/** @internal */ -#define __DEF_COMPIMPLHELPER( N ) \ -__DEF_COMPIMPLHELPER_A( N ) \ -__DEF_COMPIMPLHELPER_C( N ) -#else /** @internal */ #define __DEF_COMPIMPLHELPER( N ) \ __DEF_COMPIMPLHELPER_A( N ) \ __DEF_COMPIMPLHELPER_B( N ) \ __DEF_COMPIMPLHELPER_C( N ) -#endif #endif |