diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 22:09:15 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 22:09:15 +0000 |
| commit | b1e8b754eddd8c68801266687d9bfc7179a643c5 (patch) | |
| tree | 3c5490c61d35a6f650ad26d0f9b03890b95b7093 /cppuhelper | |
| parent | eae61c60796edba8c9e335fbec9d7119ecfafc87 (diff) | |
INTEGRATION: CWS geordi2q14 (1.8.40); FILE MERGED
2004/01/29 15:09:14 hr 1.8.40.1: #111934#: merge CWS ooo111fix2
Diffstat (limited to 'cppuhelper')
| -rw-r--r-- | cppuhelper/inc/cppuhelper/compbase3.hxx | 17 | ||||
| -rw-r--r-- | cppuhelper/inc/cppuhelper/compbase4.hxx | 17 |
2 files changed, 4 insertions, 30 deletions
diff --git a/cppuhelper/inc/cppuhelper/compbase3.hxx b/cppuhelper/inc/cppuhelper/compbase3.hxx index d2d686bc3ffa..40267fd0aff0 100644 --- a/cppuhelper/inc/cppuhelper/compbase3.hxx +++ b/cppuhelper/inc/cppuhelper/compbase3.hxx @@ -2,9 +2,9 @@ * * $RCSfile: compbase3.hxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: hr $ $Date: 2003-07-16 17:48:39 $ + * last change: $Author: hr $ $Date: 2004-02-02 23:08:55 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -65,17 +65,6 @@ #include <cppuhelper/implbase3.hxx> #endif -#if defined( MACOSX ) && ( __GNUC__ < 3 ) -/* use old impl helpers for macosx */ - -#ifndef _CPPUHELPER_COMPBASE_HXX_ -#include <cppuhelper/compbase.hxx> -#endif - -__DEF_COMPIMPLHELPER( 3 ) - -#else /* ! MACOSX */ - #ifndef _CPPUHELPER_COMPBASE_EX_HXX_ #include <cppuhelper/compbase_ex.hxx> #endif @@ -184,6 +173,4 @@ namespace cppu }; } -#endif /* MACOSX */ - #endif diff --git a/cppuhelper/inc/cppuhelper/compbase4.hxx b/cppuhelper/inc/cppuhelper/compbase4.hxx index 0617c598f5f9..a47ab56f7b3e 100644 --- a/cppuhelper/inc/cppuhelper/compbase4.hxx +++ b/cppuhelper/inc/cppuhelper/compbase4.hxx @@ -2,9 +2,9 @@ * * $RCSfile: compbase4.hxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: hr $ $Date: 2003-07-16 17:48:48 $ + * last change: $Author: hr $ $Date: 2004-02-02 23:09:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -65,17 +65,6 @@ #include <cppuhelper/implbase4.hxx> #endif -#if defined( MACOSX ) && ( __GNUC__ < 3 ) -/* use old impl helpers for macosx */ - -#ifndef _CPPUHELPER_COMPBASE_HXX_ -#include <cppuhelper/compbase.hxx> -#endif - -__DEF_COMPIMPLHELPER( 4 ) - -#else /* ! MACOSX */ - #ifndef _CPPUHELPER_COMPBASE_EX_HXX_ #include <cppuhelper/compbase_ex.hxx> #endif @@ -186,6 +175,4 @@ namespace cppu }; } -#endif /* MACOSX */ - #endif |