diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-12-17 13:58:20 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-12-18 07:59:59 +0100 |
| commit | 51e7a590976f664deb0a386d23b66bee38ea5687 (patch) | |
| tree | ab2a78261a717cb956e7ad06f4f80125838fb06e /basic | |
| parent | 8473ac2e27efff3ec902a358896a669ce05f047a (diff) | |
Elide use of rtl_Instance (which is obsoleted by C++11 thread-safe statics)
Change-Id: Ie3e099a6561c22646f07dab418f1a2f8123f1449
Reviewed-on: https://gerrit.libreoffice.org/85329
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/source/basmgr/basicmanagerrepository.cxx | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/basic/source/basmgr/basicmanagerrepository.cxx b/basic/source/basmgr/basicmanagerrepository.cxx index c493da8bd29d..1e9378ff864b 100644 --- a/basic/source/basmgr/basicmanagerrepository.cxx +++ b/basic/source/basmgr/basicmanagerrepository.cxx @@ -38,8 +38,6 @@ #include <comphelper/documentinfo.hxx> #include <unotools/eventlisteneradapter.hxx> -#include <osl/getglobalmutex.hxx> -#include <rtl/instance.hxx> #include <sot/storage.hxx> #include <map> @@ -198,19 +196,6 @@ namespace basic StarBASIC* impl_getDefaultAppBasicLibrary(); }; - namespace { - - struct CreateImplRepository - { - ImplRepository* operator()() - { - static ImplRepository repository; - return &repository; - } - }; - - } - ImplRepository::ImplRepository() { } @@ -218,8 +203,8 @@ namespace basic ImplRepository& ImplRepository::Instance() { - return *rtl_Instance< ImplRepository, CreateImplRepository, ::osl::MutexGuard, ::osl::GetGlobalMutex >:: - create( CreateImplRepository(), ::osl::GetGlobalMutex() ); + static ImplRepository repository; + return repository; } BasicManager* ImplRepository::getDocumentBasicManager( const Reference< XModel >& _rxDocumentModel ) |