diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-09-22 08:59:14 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-09-22 13:38:19 +0200 |
| commit | 6d1c8a43586503e703baebabc5330a1898f7ec43 (patch) | |
| tree | 9cdcc90534c0466025bb7bedcc0a254ced0359c3 /include/vcl/svapp.hxx | |
| parent | caea6281967bacd38a9296e6acefe9e5baefc3a4 (diff) | |
Avoid VCL_DLLPUBLIC SolarMutexGuard "taking over" template base class on MSVC
...and thus exporting osl::Guard<comphelper::SolarMutex> members from vcl. With
--disable-pch that caused linking Library_acc to fail with duplicate symbols, as
accessibility/source/standard/vclxaccessiblebutton.cxx uses
comphelper::OExternalLockGuard (include/comphelper/accessiblecontexthelper.hxx),
which also derives from osl::Guard<comphelper::SolarMutex> (and is also all-
inline, and not marked as DLLPUBLIC), so also emits such members. With
--enable-pch, vclxaccessiblebutton.cxx happens to see SolarMutexGuard from
include/vcl/svapp.hxx before comphelper::OExternalLockGuard, and thus doesn't
emit any such members.
As SolarMutexGuard is all-inline, there should not be much point in making it
VCL_DLLPUBLIC in the first place (was there ever since the class's introduction
in b450a32890184a18ed176dbf717e944190cbe643 "create a class SolarMutexGuard to
take a Guard on the SolarMutex"), so just drop that.
Change-Id: Ie9d493370c7d34981bb35e5d9e100cf987eb83ca
Reviewed-on: https://gerrit.libreoffice.org/42616
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'include/vcl/svapp.hxx')
| -rw-r--r-- | include/vcl/svapp.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx index 1d016044335e..89a375ca9e4f 100644 --- a/include/vcl/svapp.hxx +++ b/include/vcl/svapp.hxx @@ -1398,7 +1398,7 @@ private: DECL_STATIC_LINK( Application, PostEventHandler, void*, void ); }; -class VCL_DLLPUBLIC SolarMutexGuard +class SolarMutexGuard : public osl::Guard<comphelper::SolarMutex> { public: |