diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-08-17 11:38:31 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-08-17 22:40:40 +0200 |
| commit | 4dc40659044566280c202e26cab97d682ae6ab54 (patch) | |
| tree | d97f0e436aac00a5f52624959b0662eb21a534a0 /bridges | |
| parent | 889df64fbb9534491b76140d63b4340091c763e4 (diff) | |
rtl::Static -> thread-safe static local
Change-Id: I9f8fe250813f4f376dc46c6f3d7e25e90fdbb50e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120566
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx index 322656c126e5..d72295039282 100644 --- a/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx @@ -29,7 +29,6 @@ #include <dlfcn.h> #include <osl/mutex.hxx> -#include <rtl/instance.hxx> #include <rtl/strbuf.hxx> #include <rtl/ustring.hxx> #include <sal/log.hxx> @@ -265,12 +264,11 @@ std::type_info * RTTI::getRTTI(typelib_TypeDescription const & pTypeDescr) return rtti; } -struct theRttiFactory: public rtl::Static<RTTI, theRttiFactory> {}; - } std::type_info * x86_64::getRtti(typelib_TypeDescription const & type) { - return theRttiFactory::get().getRTTI(type); + static RTTI theRttiFactory; + return theRttiFactory.getRTTI(type); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |