From 3af500580b1c82eabd60335c9ebc458a3f68850c Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 8 Dec 2017 15:58:41 +0200 Subject: loplugin:salcall fix functions since cdecl is the default calling convention on Windows for such functions, the annotation is redundant. Change-Id: I1a85fa27e5ac65ce0e04a19bde74c90800ffaa2d Reviewed-on: https://gerrit.libreoffice.org/46164 Tested-by: Jenkins Reviewed-by: Noel Grandin --- binaryurp/source/bridge.cxx | 2 +- binaryurp/source/bridgefactory.cxx | 2 +- binaryurp/source/proxy.cxx | 6 +++--- binaryurp/source/reader.cxx | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'binaryurp/source') diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx index d39d1f24e667..d1c7256c6ad5 100644 --- a/binaryurp/source/bridge.cxx +++ b/binaryurp/source/bridge.cxx @@ -86,7 +86,7 @@ OUString toString(css::uno::TypeDescription const & type) { return OUString(d->pTypeName); } -extern "C" void SAL_CALL freeProxyCallback( +extern "C" void freeProxyCallback( SAL_UNUSED_PARAMETER uno_ExtEnvironment *, void * pProxy) { assert(pProxy != nullptr); diff --git a/binaryurp/source/bridgefactory.cxx b/binaryurp/source/bridgefactory.cxx index b1e3be93ea74..d82599363288 100644 --- a/binaryurp/source/bridgefactory.cxx +++ b/binaryurp/source/bridgefactory.cxx @@ -210,7 +210,7 @@ static cppu::ImplementationEntry const services[] = { } -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL binaryurp_component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * binaryurp_component_getFactory( char const * pImplName, void * pServiceManager, void * pRegistryKey) { return cppu::component_getFactoryHelper( diff --git a/binaryurp/source/proxy.cxx b/binaryurp/source/proxy.cxx index 5f83660f1ddd..0e5a92b68f9e 100644 --- a/binaryurp/source/proxy.cxx +++ b/binaryurp/source/proxy.cxx @@ -42,17 +42,17 @@ namespace binaryurp { namespace { -extern "C" void SAL_CALL proxy_acquireInterface(uno_Interface * pInterface) { +extern "C" void proxy_acquireInterface(uno_Interface * pInterface) { assert(pInterface != nullptr); static_cast< Proxy * >(pInterface)->do_acquire(); } -extern "C" void SAL_CALL proxy_releaseInterface(uno_Interface * pInterface) { +extern "C" void proxy_releaseInterface(uno_Interface * pInterface) { assert(pInterface != nullptr); static_cast< Proxy * >(pInterface)->do_release(); } -extern "C" void SAL_CALL proxy_dispatchInterface( +extern "C" void proxy_dispatchInterface( uno_Interface * pUnoI, typelib_TypeDescription const * pMemberType, void * pReturn, void ** pArgs, uno_Any ** ppException) { diff --git a/binaryurp/source/reader.cxx b/binaryurp/source/reader.cxx index 7ce1ba1244c3..fa5e91be704e 100644 --- a/binaryurp/source/reader.cxx +++ b/binaryurp/source/reader.cxx @@ -78,7 +78,7 @@ css::uno::Sequence< sal_Int8 > read( return buf; } -extern "C" void SAL_CALL request(void * pThreadSpecificData) { +extern "C" void request(void * pThreadSpecificData) { assert(pThreadSpecificData != nullptr); std::unique_ptr< IncomingRequest >( static_cast< IncomingRequest * >(pThreadSpecificData))-> -- cgit