diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 22:12:15 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 22:12:15 +0000 |
| commit | 918c92ff0ab2d0ae07bc8184b029d5954326c636 (patch) | |
| tree | d5fa8ae2584fa4d4da1625513e2855b49e2531d3 /cppuhelper | |
| parent | a90a6d48ff802e20e0248f5ba07422ac57786f4a (diff) | |
INTEGRATION: CWS geordi2q14 (1.8.40); FILE MERGED
2004/01/29 15:09:33 hr 1.8.40.1: #111934#: merge CWS ooo111fix2
Diffstat (limited to 'cppuhelper')
| -rw-r--r-- | cppuhelper/inc/cppuhelper/implbase2.hxx | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/cppuhelper/inc/cppuhelper/implbase2.hxx b/cppuhelper/inc/cppuhelper/implbase2.hxx index d0ef3f3fb4fe..39ae5f7fbdc6 100644 --- a/cppuhelper/inc/cppuhelper/implbase2.hxx +++ b/cppuhelper/inc/cppuhelper/implbase2.hxx @@ -2,9 +2,9 @@ * * $RCSfile: implbase2.hxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: hr $ $Date: 2003-07-16 17:50:29 $ + * last change: $Author: hr $ $Date: 2004-02-02 23:12:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,23 +61,6 @@ #ifndef _CPPUHELPER_IMPLBASE2_HXX_ #define _CPPUHELPER_IMPLBASE2_HXX_ -#if defined( MACOSX ) && ( __GNUC__ < 3 ) -/* use old impl helpers for macosx */ - -#define __IFC2 Ifc1, Ifc2 -#define __CLASS_IFC2 class Ifc1, class Ifc2 -#define __PUBLIC_IFC2 public Ifc1, public Ifc2 - -#ifndef _CPPUHELPER_IMPLBASE_HXX_ -#include <cppuhelper/implbase.hxx> -#endif - -__DEF_IMPLHELPER_PRE( 2 ) - __IFC_WRITEOFFSET( 1 ) __IFC_WRITEOFFSET( 2 ) -__DEF_IMPLHELPER_POST( 2 ) - -#else /* ! MACOSX */ - #ifndef _CPPUHELPER_IMPLBASE_EX_HXX_ #include <cppuhelper/implbase_ex.hxx> #endif @@ -323,6 +306,4 @@ namespace cppu }; } -#endif /* MACOSX */ - #endif |