strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS warnings01 (1.12.2); FILE MERGED

Browse source 
2005/11/09 20:54:26 sb 1.12.2.1: #i53898# Avoid warnings about name hiding from template code, when instantiated for certain class arguments.
This commit is contained in:
Jens-Heiner Rechtien 2006-06-19 09:30:40 +00:00
parent d8d727bcd0
commit 19b14f6175
3 changed files with 42 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
cppuhelper/inc/cppuhelper/compbase7.hxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: compbase7.hxx,v $
*
* $Revision: 1.12 $
* $Revision: 1.13 $
*
* last change: $Author: hr $ $Date: 2005-10-27 17:15:59 $
* last change: $Author: hr $ $Date: 2006-06-19 10:30:06 $
*
* 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( 7 )
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.

16
cppuhelper/inc/cppuhelper/compbase8.hxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: compbase8.hxx,v $
*
* $Revision: 1.12 $
* $Revision: 1.13 $
*
* last change: $Author: hr $ $Date: 2005-10-27 17:16:13 $
* last change: $Author: hr $ $Date: 2006-06-19 10:30:19 $
*
* 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( 8 )
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.

16
cppuhelper/inc/cppuhelper/compbase9.hxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: compbase9.hxx,v $
*
* $Revision: 1.12 $
* $Revision: 1.13 $
*
* last change: $Author: hr $ $Date: 2005-10-27 17:16:25 $
* last change: $Author: hr $ $Date: 2006-06-19 10:30:40 $
*
* 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( 9 )
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.
Upon disposing objects of this class, sub-classes receive a disposing()