From 2670ca3fc597decae78499d1397539668eb84e5e Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 27 Jan 2017 14:41:46 +0200 Subject: a whole bunch of SAL_WARN_UNUSED Change-Id: Iea28debc7d3abc58cca21bd3856cb65b321dc1e6 Reviewed-on: https://gerrit.libreoffice.org/33693 Tested-by: Jenkins Reviewed-by: Noel Grandin --- include/cppuhelper/access_control.hxx | 4 ++-- include/cppuhelper/basemutex.hxx | 2 +- include/cppuhelper/component_context.hxx | 2 +- include/cppuhelper/implbase1.hxx | 2 +- include/cppuhelper/implbase10.hxx | 2 +- include/cppuhelper/implbase11.hxx | 2 +- include/cppuhelper/implbase12.hxx | 2 +- include/cppuhelper/implbase13.hxx | 2 +- include/cppuhelper/implbase2.hxx | 2 +- include/cppuhelper/implbase3.hxx | 2 +- include/cppuhelper/implbase4.hxx | 2 +- include/cppuhelper/implbase5.hxx | 2 +- include/cppuhelper/implbase6.hxx | 2 +- include/cppuhelper/implbase7.hxx | 2 +- include/cppuhelper/implbase8.hxx | 2 +- include/cppuhelper/implbase9.hxx | 2 +- include/cppuhelper/implbase_ex.hxx | 4 ++-- include/cppuhelper/implementationentry.hxx | 2 +- include/cppuhelper/interfacecontainer.h | 4 ++-- include/cppuhelper/propshlp.hxx | 7 ++++--- include/cppuhelper/typeprovider.hxx | 4 ++-- include/cppuhelper/unourl.hxx | 4 ++-- 22 files changed, 30 insertions(+), 29 deletions(-) (limited to 'include/cppuhelper') diff --git a/include/cppuhelper/access_control.hxx b/include/cppuhelper/access_control.hxx index 464b95d2367c..cf10806d9033 100644 --- a/include/cppuhelper/access_control.hxx +++ b/include/cppuhelper/access_control.hxx @@ -27,9 +27,9 @@ namespace cppu { -/** Helper class retriving access controller singleton from component context. +/** Helper class for retrieving access controller singleton from component context. */ -class CPPUHELPER_DLLPUBLIC AccessControl +class SAL_WARN_UNUSED CPPUHELPER_DLLPUBLIC AccessControl { css::uno::Reference< css::security::XAccessController > m_xController; diff --git a/include/cppuhelper/basemutex.hxx b/include/cppuhelper/basemutex.hxx index 48c4aa49a501..aaf1f6a65a6c 100644 --- a/include/cppuhelper/basemutex.hxx +++ b/include/cppuhelper/basemutex.hxx @@ -32,7 +32,7 @@ namespace cppu initialized when the mutex is used to intialize the cppu::WeakComponentImplHelperXX */ - class BaseMutex + class SAL_WARN_UNUSED BaseMutex { protected: mutable ::osl::Mutex m_aMutex; diff --git a/include/cppuhelper/component_context.hxx b/include/cppuhelper/component_context.hxx index fe71106e2dbc..e6de21c710c1 100644 --- a/include/cppuhelper/component_context.hxx +++ b/include/cppuhelper/component_context.hxx @@ -32,7 +32,7 @@ namespace cppu /** Context entries init struct calling createComponentContext(). */ -struct ContextEntry_Init +struct SAL_WARN_UNUSED ContextEntry_Init { /** late init denotes a object that will be raised when first get() is calling for it diff --git a/include/cppuhelper/implbase1.hxx b/include/cppuhelper/implbase1.hxx index 952387ef201f..3f93735a823d 100644 --- a/include/cppuhelper/implbase1.hxx +++ b/include/cppuhelper/implbase1.hxx @@ -35,7 +35,7 @@ namespace cppu type_entry m_typeEntries[ 1 + 1 ]; }; - template< typename Ifc1, typename Impl > struct ImplClassData1 + template< typename Ifc1, typename Impl > struct SAL_WARN_UNUSED ImplClassData1 { class_data* operator ()() { diff --git a/include/cppuhelper/implbase10.hxx b/include/cppuhelper/implbase10.hxx index a4657a665874..7b1e5920505d 100644 --- a/include/cppuhelper/implbase10.hxx +++ b/include/cppuhelper/implbase10.hxx @@ -36,7 +36,7 @@ namespace cppu }; template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Ifc7, typename Ifc8, typename Ifc9, typename Ifc10, typename Impl > - struct ImplClassData10 + struct SAL_WARN_UNUSED ImplClassData10 { class_data* operator ()() { diff --git a/include/cppuhelper/implbase11.hxx b/include/cppuhelper/implbase11.hxx index 9cd24a8c11d0..2eccf402e3f9 100644 --- a/include/cppuhelper/implbase11.hxx +++ b/include/cppuhelper/implbase11.hxx @@ -36,7 +36,7 @@ namespace cppu }; template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Ifc7, typename Ifc8, typename Ifc9, typename Ifc10, typename Ifc11, typename Impl > - struct ImplClassData11 + struct SAL_WARN_UNUSED ImplClassData11 { class_data* operator ()() { diff --git a/include/cppuhelper/implbase12.hxx b/include/cppuhelper/implbase12.hxx index 43a02cf60fa2..e63e1bab0be5 100644 --- a/include/cppuhelper/implbase12.hxx +++ b/include/cppuhelper/implbase12.hxx @@ -36,7 +36,7 @@ namespace cppu }; template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Ifc7, typename Ifc8, typename Ifc9, typename Ifc10, typename Ifc11, typename Ifc12, typename Impl > - struct ImplClassData12 + struct SAL_WARN_UNUSED ImplClassData12 { class_data* operator ()() { diff --git a/include/cppuhelper/implbase13.hxx b/include/cppuhelper/implbase13.hxx index 995f0453a141..4f4aac6c6613 100644 --- a/include/cppuhelper/implbase13.hxx +++ b/include/cppuhelper/implbase13.hxx @@ -36,7 +36,7 @@ namespace cppu }; template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Ifc7, typename Ifc8, typename Ifc9, typename Ifc10, typename Ifc11, typename Ifc12, typename Ifc13, typename Impl > - struct ImplClassData13 + struct SAL_WARN_UNUSED ImplClassData13 { class_data* operator ()() { diff --git a/include/cppuhelper/implbase2.hxx b/include/cppuhelper/implbase2.hxx index 1d1b36fec1ef..de6c716c652f 100644 --- a/include/cppuhelper/implbase2.hxx +++ b/include/cppuhelper/implbase2.hxx @@ -35,7 +35,7 @@ namespace cppu type_entry m_typeEntries[ 2 + 1 ]; }; - template< typename Ifc1, typename Ifc2, typename Impl > struct ImplClassData2 + template< typename Ifc1, typename Ifc2, typename Impl > struct SAL_WARN_UNUSED ImplClassData2 { class_data* operator ()() { diff --git a/include/cppuhelper/implbase3.hxx b/include/cppuhelper/implbase3.hxx index c9a0d35ba3c6..47941db70929 100644 --- a/include/cppuhelper/implbase3.hxx +++ b/include/cppuhelper/implbase3.hxx @@ -35,7 +35,7 @@ namespace cppu type_entry m_typeEntries[ 3 + 1 ]; }; - template< typename Ifc1, typename Ifc2, typename Ifc3, typename Impl > struct ImplClassData3 + template< typename Ifc1, typename Ifc2, typename Ifc3, typename Impl > struct SAL_WARN_UNUSED ImplClassData3 { class_data* operator ()() { diff --git a/include/cppuhelper/implbase4.hxx b/include/cppuhelper/implbase4.hxx index a4879760bea1..2a2e2cb288de 100644 --- a/include/cppuhelper/implbase4.hxx +++ b/include/cppuhelper/implbase4.hxx @@ -36,7 +36,7 @@ namespace cppu }; template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Impl > - struct ImplClassData4 + struct SAL_WARN_UNUSED ImplClassData4 { class_data* operator ()() { diff --git a/include/cppuhelper/implbase5.hxx b/include/cppuhelper/implbase5.hxx index 6540bfcf179f..fe6fa2653b5b 100644 --- a/include/cppuhelper/implbase5.hxx +++ b/include/cppuhelper/implbase5.hxx @@ -36,7 +36,7 @@ namespace cppu }; template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Impl > - struct ImplClassData5 + struct SAL_WARN_UNUSED ImplClassData5 { class_data* operator ()() { diff --git a/include/cppuhelper/implbase6.hxx b/include/cppuhelper/implbase6.hxx index c4d50dd04d17..1dbb48167bc1 100644 --- a/include/cppuhelper/implbase6.hxx +++ b/include/cppuhelper/implbase6.hxx @@ -36,7 +36,7 @@ namespace cppu }; template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Impl > - struct ImplClassData6 + struct SAL_WARN_UNUSED ImplClassData6 { class_data* operator ()() { diff --git a/include/cppuhelper/implbase7.hxx b/include/cppuhelper/implbase7.hxx index 01f500b74ae7..e1ca12482e83 100644 --- a/include/cppuhelper/implbase7.hxx +++ b/include/cppuhelper/implbase7.hxx @@ -36,7 +36,7 @@ namespace cppu }; template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Ifc7, typename Impl > - struct ImplClassData7 + struct SAL_WARN_UNUSED ImplClassData7 { class_data* operator ()() { diff --git a/include/cppuhelper/implbase8.hxx b/include/cppuhelper/implbase8.hxx index a09d28495e99..279b3206d613 100644 --- a/include/cppuhelper/implbase8.hxx +++ b/include/cppuhelper/implbase8.hxx @@ -36,7 +36,7 @@ namespace cppu }; template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Ifc7, typename Ifc8, typename Impl > - struct ImplClassData8 + struct SAL_WARN_UNUSED ImplClassData8 { class_data* operator ()() { diff --git a/include/cppuhelper/implbase9.hxx b/include/cppuhelper/implbase9.hxx index 6b82c2733be1..09bb6c69a4c1 100644 --- a/include/cppuhelper/implbase9.hxx +++ b/include/cppuhelper/implbase9.hxx @@ -36,7 +36,7 @@ namespace cppu }; template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Ifc7, typename Ifc8, typename Ifc9, typename Impl > - struct ImplClassData9 + struct SAL_WARN_UNUSED ImplClassData9 { class_data* operator ()() { diff --git a/include/cppuhelper/implbase_ex.hxx b/include/cppuhelper/implbase_ex.hxx index ce8dfacd0647..d8711f17bb79 100644 --- a/include/cppuhelper/implbase_ex.hxx +++ b/include/cppuhelper/implbase_ex.hxx @@ -46,7 +46,7 @@ typedef css::uno::Type const & (SAL_CALL * fptr_getCppuType)( void * ); /** single type + object offset */ -struct type_entry +struct SAL_WARN_UNUSED type_entry { /** the type_entry is initialized with function pointer to ::getCppuType() function first, but holds an unacquired typelib_TypeDescriptionReference * after initialization, @@ -69,7 +69,7 @@ struct type_entry /** identical dummy struct for casting class_dataN to class_data */ -struct class_data +struct SAL_WARN_UNUSED class_data { /** number of supported types in m_typeEntries */ diff --git a/include/cppuhelper/implementationentry.hxx b/include/cppuhelper/implementationentry.hxx index d2d4bd6ab62c..e7bb34b838a6 100644 --- a/include/cppuhelper/implementationentry.hxx +++ b/include/cppuhelper/implementationentry.hxx @@ -37,7 +37,7 @@ namespace cppu /** One struct instance represents all data necessary for registering one service implementation. */ -struct ImplementationEntry +struct SAL_WARN_UNUSED ImplementationEntry { /** Function that creates an instance of the implementation */ diff --git a/include/cppuhelper/interfacecontainer.h b/include/cppuhelper/interfacecontainer.h index 151ff6f81424..3daa656b5664 100644 --- a/include/cppuhelper/interfacecontainer.h +++ b/include/cppuhelper/interfacecontainer.h @@ -124,7 +124,7 @@ private: @see OInterfaceIteratorHelper */ -class CPPUHELPER_DLLPUBLIC OInterfaceContainerHelper +class SAL_WARN_UNUSED CPPUHELPER_DLLPUBLIC OInterfaceContainerHelper { public: // these are here to force memory de/allocation to sal lib. @@ -432,7 +432,7 @@ private: can't compile addListener( const container::keyType &key ). */ template < class container , class keyType > -struct OBroadcastHelperVar +struct SAL_WARN_UNUSED OBroadcastHelperVar { /** The shared mutex. */ ::osl::Mutex & rMutex; diff --git a/include/cppuhelper/propshlp.hxx b/include/cppuhelper/propshlp.hxx index a546f5c6dba4..b1f2a5082b0b 100644 --- a/include/cppuhelper/propshlp.hxx +++ b/include/cppuhelper/propshlp.hxx @@ -43,7 +43,7 @@ namespace cppu /** This interface is used by the OPropertyHelper, to access the property description. */ -class CPPUHELPER_DLLPUBLIC IPropertyArrayHelper +class SAL_WARN_UNUSED CPPUHELPER_DLLPUBLIC IPropertyArrayHelper { public: // these are here to force memory de/allocation to sal lib. @@ -109,7 +109,7 @@ public: You can use this helper class to map a XPropertySet-Interface to a XFast- or a XMultiPropertySet interface. */ -class CPPUHELPER_DLLPUBLIC OPropertyArrayHelper : public IPropertyArrayHelper +class SAL_WARN_UNUSED CPPUHELPER_DLLPUBLIC OPropertyArrayHelper : public IPropertyArrayHelper { public: /** @@ -215,10 +215,11 @@ struct hashInt32_Impl size_t operator()(const sal_Int32 & i) const { return i; } }; + /** Specialized class for key type sal_Int32, without explicit usage of STL symbols. */ -class CPPUHELPER_DLLPUBLIC OMultiTypeInterfaceContainerHelperInt32 +class SAL_WARN_UNUSED CPPUHELPER_DLLPUBLIC OMultiTypeInterfaceContainerHelperInt32 { public: // these are here to force memory de/allocation to sal lib. diff --git a/include/cppuhelper/typeprovider.hxx b/include/cppuhelper/typeprovider.hxx index d1ff52dd4a3f..e90ea3c00236 100644 --- a/include/cppuhelper/typeprovider.hxx +++ b/include/cppuhelper/typeprovider.hxx @@ -34,7 +34,7 @@ namespace cppu /** Helper class to implement css::lang::XTypeProvider. Construct a static object of this class with your UNO object's supported types. */ -class CPPUHELPER_DLLPUBLIC OTypeCollection +class SAL_WARN_UNUSED CPPUHELPER_DLLPUBLIC OTypeCollection { css::uno::Sequence< css::uno::Type > _aTypes; @@ -168,7 +168,7 @@ public: /** Helper class to implement IDs for XUnoTunnel. Construct a static object of this class for your UNO object's implementation id. */ -class CPPUHELPER_DLLPUBLIC OImplementationId +class SAL_WARN_UNUSED CPPUHELPER_DLLPUBLIC OImplementationId { mutable css::uno::Sequence< sal_Int8 > * _pSeq; sal_Bool _bUseEthernetAddress; diff --git a/include/cppuhelper/unourl.hxx b/include/cppuhelper/unourl.hxx index 64608b134d17..e31ef6bf5cff 100644 --- a/include/cppuhelper/unourl.hxx +++ b/include/cppuhelper/unourl.hxx @@ -35,7 +35,7 @@ namespace cppu { For example, some functions take a string representing a connection or protocol descriptor as input, and can use this class to parse the string. */ -class CPPUHELPER_DLLPUBLIC UnoUrlDescriptor +class SAL_WARN_UNUSED CPPUHELPER_DLLPUBLIC UnoUrlDescriptor { public: class Impl; @@ -126,7 +126,7 @@ private: invalid UTF-16 entities in the resulting output (e.g., a high surrogate not followed by a low surrogate) are not detected. */ -class CPPUHELPER_DLLPUBLIC UnoUrl +class SAL_WARN_UNUSED CPPUHELPER_DLLPUBLIC UnoUrl { public: /** Construct a UNO URL from a string representation. -- cgit