diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 22:11:09 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 22:11:09 +0000 |
| commit | 9e05306f45168c4285e031e81cceef2dc20a8e99 (patch) | |
| tree | 05743109538e943cc1ee43cfbe7371510b15a3db /cppuhelper | |
| parent | fd4d1353962fe2f33ce55596cb374fa81515e2b1 (diff) | |
INTEGRATION: CWS geordi2q14 (1.8.40); FILE MERGED
2004/01/29 15:09:24 hr 1.8.40.1: #111934#: merge CWS ooo111fix2
Diffstat (limited to 'cppuhelper')
| -rw-r--r-- | cppuhelper/inc/cppuhelper/implbase1.hxx | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/cppuhelper/inc/cppuhelper/implbase1.hxx b/cppuhelper/inc/cppuhelper/implbase1.hxx index de1fc17eebb4..1e60a6c9cdc0 100644 --- a/cppuhelper/inc/cppuhelper/implbase1.hxx +++ b/cppuhelper/inc/cppuhelper/implbase1.hxx @@ -2,9 +2,9 @@ * * $RCSfile: implbase1.hxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: hr $ $Date: 2003-07-16 17:49:49 $ + * last change: $Author: hr $ $Date: 2004-02-02 23:11:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,23 +61,6 @@ #ifndef _CPPUHELPER_IMPLBASE1_HXX_ #define _CPPUHELPER_IMPLBASE1_HXX_ -#if defined( MACOSX ) && ( __GNUC__ < 3 ) -/* use old impl helpers for macosx */ - -#define __IFC1 Ifc1 -#define __CLASS_IFC1 class Ifc1 -#define __PUBLIC_IFC1 public Ifc1 - -#ifndef _CPPUHELPER_IMPLBASE_HXX_ -#include <cppuhelper/implbase.hxx> -#endif - -__DEF_IMPLHELPER_PRE( 1 ) - __IFC_WRITEOFFSET( 1 ) -__DEF_IMPLHELPER_POST( 1 ) - -#else /* ! MACOSX */ - #ifndef _CPPUHELPER_IMPLBASE_EX_HXX_ #include <cppuhelper/implbase_ex.hxx> #endif @@ -318,6 +301,4 @@ namespace cppu }; } -#endif /* MACOSX */ - #endif |