diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-12-17 13:56:07 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-12-18 07:59:40 +0100 |
| commit | 8473ac2e27efff3ec902a358896a669ce05f047a (patch) | |
| tree | 557a61934bbbd48edc0e73468c558921f894d0fe /bridges | |
| parent | 1bc50aca32a2c76017a552a06dca2c941ab38f7a (diff) | |
Elide use of rtl_Instance (which is obsoleted by C++11 thread-safe statics)
which does not seem to have been doing anything useful here anyway, not
since
commit 730399de90add4e35da9754a8f7525b443237026
Date: Wed Jul 18 11:16:06 2007 +0000
INTEGRATION: CWS unomacli64 (1.6.50); FILE MERGED
2007/06/20 10:29:46 kr 1.6.50.1: fixed: #i78284#
Change-Id: I57345a08c333953a66b3a5f3be1fe9a2f1f092ef
Reviewed-on: https://gerrit.libreoffice.org/85328
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx b/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx index 422b6893b3a2..466d83ef46a4 100644 --- a/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx +++ b/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx @@ -23,9 +23,6 @@ #include <vtablefactory.hxx> #include <com/sun/star/uno/XInterface.hpp> -#include <osl/getglobalmutex.hxx> -#include <osl/mutex.hxx> -#include <rtl/instance.hxx> #include <typelib/typedescription.h> #include <cstddef> @@ -53,23 +50,6 @@ void dso_exit() { } } -namespace { - -struct InitVtableFactory { - bridges::cpp_uno::shared::VtableFactory * operator()() { - return pInstance; - } -}; - -bridges::cpp_uno::shared::VtableFactory * getVtableFactory() { - return rtl_Instance< - bridges::cpp_uno::shared::VtableFactory, InitVtableFactory, - osl::MutexGuard, osl::GetGlobalMutex >::create( - InitVtableFactory(), osl::GetGlobalMutex()); -} - -} - namespace bridges { namespace cpp_uno { namespace shared { void freeCppInterfaceProxy(uno_ExtEnvironment * pEnv, void * pInterface) @@ -101,7 +81,7 @@ com::sun::star::uno::XInterface * CppInterfaceProxy::create( typelib_typedescription_complete( reinterpret_cast< typelib_TypeDescription ** >(&pTypeDescr)); const bridges::cpp_uno::shared::VtableFactory::Vtables& rVtables( - getVtableFactory()->getVtables(pTypeDescr)); + pInstance->getVtables(pTypeDescr)); std::unique_ptr< char[] > pMemory( new char[ sizeof (CppInterfaceProxy) |