diff options
Diffstat (limited to 'cppu/inc/com/sun/star/uno')
-rw-r--r-- | cppu/inc/com/sun/star/uno/Any.h | 2 | ||||
-rw-r--r-- | cppu/inc/com/sun/star/uno/Sequence.hxx | 11 | ||||
-rw-r--r-- | cppu/inc/com/sun/star/uno/Type.hxx | 26 |
3 files changed, 22 insertions, 17 deletions
diff --git a/cppu/inc/com/sun/star/uno/Any.h b/cppu/inc/com/sun/star/uno/Any.h index a2fe589682f4..b904d08ec356 100644 --- a/cppu/inc/com/sun/star/uno/Any.h +++ b/cppu/inc/com/sun/star/uno/Any.h @@ -375,7 +375,7 @@ inline sal_Bool SAL_CALL operator == ( const Any & rAny, const BaseReference & v @return type of IDL type any */ -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const ::com::sun::star::uno::Any * ) SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const ::com::sun::star::uno::Any * ) SAL_THROW( () ) { return ::cppu::UnoType< ::com::sun::star::uno::Any >::get(); } diff --git a/cppu/inc/com/sun/star/uno/Sequence.hxx b/cppu/inc/com/sun/star/uno/Sequence.hxx index c86c629df7bc..c8907d34e6bd 100644 --- a/cppu/inc/com/sun/star/uno/Sequence.hxx +++ b/cppu/inc/com/sun/star/uno/Sequence.hxx @@ -225,7 +225,9 @@ inline ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL toUnoSequence( namespace cppu { template< typename T > inline ::com::sun::star::uno::Type const & -getTypeFavourUnsigned(::com::sun::star::uno::Sequence< T > const *) { +getTypeFavourUnsigned( + SAL_UNUSED_PARAMETER ::com::sun::star::uno::Sequence< T > const *) +{ if (::com::sun::star::uno::Sequence< T >::s_pType == 0) { ::typelib_static_sequence_type_init( &::com::sun::star::uno::Sequence< T >::s_pType, @@ -240,7 +242,9 @@ getTypeFavourUnsigned(::com::sun::star::uno::Sequence< T > const *) { } template< typename T > inline ::com::sun::star::uno::Type const & -getTypeFavourChar(::com::sun::star::uno::Sequence< T > const *) { +getTypeFavourChar( + SAL_UNUSED_PARAMETER ::com::sun::star::uno::Sequence< T > const *) +{ //TODO On certain platforms with weak memory models, the following code can // result in some threads observing that td points to garbage: static typelib_TypeDescriptionReference * td = 0; @@ -261,7 +265,8 @@ getTypeFavourChar(::com::sun::star::uno::Sequence< T > const *) { // generic sequence template template< class E > inline const ::com::sun::star::uno::Type & -SAL_CALL getCppuType( const ::com::sun::star::uno::Sequence< E > * ) +SAL_CALL getCppuType( + SAL_UNUSED_PARAMETER const ::com::sun::star::uno::Sequence< E > * ) SAL_THROW( () ) { return ::cppu::getTypeFavourUnsigned( diff --git a/cppu/inc/com/sun/star/uno/Type.hxx b/cppu/inc/com/sun/star/uno/Type.hxx index 46fd86329424..6b53d8192931 100644 --- a/cppu/inc/com/sun/star/uno/Type.hxx +++ b/cppu/inc/com/sun/star/uno/Type.hxx @@ -103,7 +103,7 @@ typelib_TypeDescriptionReference * Array< T >::s_pType = 0; } } -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const ::com::sun::star::uno::Type * ) SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const ::com::sun::star::uno::Type * ) SAL_THROW( () ) { return ::cppu::UnoType< ::com::sun::star::uno::Type >::get(); } @@ -125,13 +125,13 @@ inline const ::com::sun::star::uno::Type & SAL_CALL getBooleanCppuType() SAL_THR { return ::cppu::UnoType< bool >::get(); } -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Bool * ) SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const sal_Bool * ) SAL_THROW( () ) { return ::cppu::UnoType< bool >::get(); } inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( - bool const * ) SAL_THROW( () ) + SAL_UNUSED_PARAMETER bool const * ) SAL_THROW( () ) { return ::cppu::UnoType< bool >::get(); } @@ -145,52 +145,52 @@ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuCharType() SAL_THROW( return ::cppu::UnoType< ::cppu::UnoCharType >::get(); } -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int8 * ) SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const sal_Int8 * ) SAL_THROW( () ) { return ::cppu::UnoType< ::sal_Int8 >::get(); } -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const ::rtl::OUString * ) SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const ::rtl::OUString * ) SAL_THROW( () ) { return ::cppu::UnoType< ::rtl::OUString >::get(); } -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int16 * ) SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const sal_Int16 * ) SAL_THROW( () ) { return ::cppu::UnoType< ::sal_Int16 >::get(); } -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_uInt16 * ) SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const sal_uInt16 * ) SAL_THROW( () ) { return ::cppu::UnoType< ::cppu::UnoUnsignedShortType >::get(); } -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int32 * ) SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const sal_Int32 * ) SAL_THROW( () ) { return ::cppu::UnoType< ::sal_Int32 >::get(); } -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_uInt32 * ) SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const sal_uInt32 * ) SAL_THROW( () ) { return ::cppu::UnoType< ::sal_uInt32 >::get(); } -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int64 * ) SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const sal_Int64 * ) SAL_THROW( () ) { return ::cppu::UnoType< ::sal_Int64 >::get(); } -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_uInt64 * ) SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const sal_uInt64 * ) SAL_THROW( () ) { return ::cppu::UnoType< ::sal_uInt64 >::get(); } -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const float * ) SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const float * ) SAL_THROW( () ) { return ::cppu::UnoType< float >::get(); } -inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const double * ) SAL_THROW( () ) +inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const double * ) SAL_THROW( () ) { return ::cppu::UnoType< double >::get(); } |