diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2019-12-18 10:30:41 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2019-12-18 13:02:20 +0100 |
commit | 60274d430881ffe8681a2920b4df589d16942ace (patch) | |
tree | b5cb0d314bc3a9cd46dafe8f4313a7426ccff638 /bridges/inc | |
parent | fb1eac64df88baae9f211d052793773686c0e180 (diff) |
Elide use of rtl_Instance (which is obsoleted by C++11 thread-safe statics),
...redux, after 8473ac2e27efff3ec902a358896a669ce05f047a "Elide use of
rtl_Instance (which is obsoleted by C++11 thread-safe statics)" had done the
same in parallel but forgot to remove some now-unnecessary parts:
There appears to be no good reason to control the lifecycle of the VtableFactory
instance via dso_init/exit, instead of via a plain static local variable.
This removes the need for the Windows DllMain functions. They also called
DisableThreadLibraryCalls, which disables the DLL_THREAD_ATTACH and
DLL_THREAD_DETACH notifications for the respective DllMain. Lets assume that
this was only done (as an optimization) because there had to be a user-provided
DllMain, and that it was not in itself a reason to have a user-provided DllMain.
(Most other DllMain across the code base that call DisableThreadLibraryCalls
also do something else. The only DllMain that only calls
DisableThreadLibraryCalls is the one in
shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx, introduced with
3fbfb21e298ba506c50733d4aaefc7550bca2fe4 "INTEGRATION: CWS desktintgr02".)
Change-Id: I696e1c8d49060853c1a2c24f67469f6adfea6801
Reviewed-on: https://gerrit.libreoffice.org/85367
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'bridges/inc')
-rw-r--r-- | bridges/inc/cppinterfaceproxy.hxx | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/bridges/inc/cppinterfaceproxy.hxx b/bridges/inc/cppinterfaceproxy.hxx index 4755ea90bced..7d5ab7b167b2 100644 --- a/bridges/inc/cppinterfaceproxy.hxx +++ b/bridges/inc/cppinterfaceproxy.hxx @@ -36,11 +36,6 @@ namespace com { namespace sun { namespace star { namespace uno { class XInterface; } } } } -#if !defined __GNUG__ -void dso_init(); -void dso_exit(); -#endif - namespace bridges { namespace cpp_uno { namespace shared { class Bridge; |