diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 09:29:15 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 09:29:15 +0000 |
| commit | 3fa87b0a71ac05e54cf175d3fc1ff546343a4f7b (patch) | |
| tree | f4d57fa521f2ac8b8464503c3e8ac1b04ca2db52 /cppuhelper/inc/cppuhelper/compbase3.hxx | |
| parent | 10f2af6f784becb65eb9a70cdf6cb553d685af06 (diff) | |
INTEGRATION: CWS warnings01 (1.12.2); FILE MERGED
2005/11/09 20:54:24 sb 1.12.2.1: #i53898# Avoid warnings about name hiding from template code, when instantiated for certain class arguments.
Diffstat (limited to 'cppuhelper/inc/cppuhelper/compbase3.hxx')
| -rw-r--r-- | cppuhelper/inc/cppuhelper/compbase3.hxx | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/cppuhelper/inc/cppuhelper/compbase3.hxx b/cppuhelper/inc/cppuhelper/compbase3.hxx index 68b4dc7bf5da..a265f7d34836 100644 --- a/cppuhelper/inc/cppuhelper/compbase3.hxx +++ b/cppuhelper/inc/cppuhelper/compbase3.hxx @@ -4,9 +4,9 @@ * * $RCSfile: compbase3.hxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: hr $ $Date: 2005-10-27 17:14:53 $ + * last change: $Author: hr $ $Date: 2006-06-19 10:29:15 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -48,6 +48,13 @@ __DEF_COMPIMPLHELPER_EX( 3 ) namespace cppu { + +// Suppress warnings about hidden functions in case any of the IfcN has +// functions named dispose, addEventListener, or removeEventListener: +#if defined __SUNPRO_CC +#pragma disable_warn +#endif + /** Implementation helper supporting ::com::sun::star::lang::XTypeProvider and ::com::sun::star::lang::XComponent. @@ -91,6 +98,11 @@ namespace cppu virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException) { return ImplHelper_getImplementationId( cd::get() ); } }; + +#if defined __SUNPRO_CC +#pragma enable_warn +#endif + /** Implementation helper supporting ::com::sun::star::lang::XTypeProvider and ::com::sun::star::lang::XComponent. |