diff options
| author | Noel Grandin <noel@peralex.com> | 2018-06-03 13:07:55 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-06-06 08:55:02 +0200 |
| commit | 9739c37d8ad7c6fca269709674a6975fa7ebd191 (patch) | |
| tree | fae0bf0830d41d66017815ff6a665610d2c65a8a /include/unotools | |
| parent | a96a260a5fd6303eeebb26aee4be24ddf88391d1 (diff) | |
enable incremental linking on windows
requires a handful of workarounds
Change-Id: I77c25580135eeec437716eceea1412607f8d14ca
Reviewed-on: https://gerrit.libreoffice.org/55244
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/unotools')
| -rw-r--r-- | include/unotools/streamwrap.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/unotools/streamwrap.hxx b/include/unotools/streamwrap.hxx index b50b92434fd8..81f463ea6e2c 100644 --- a/include/unotools/streamwrap.hxx +++ b/include/unotools/streamwrap.hxx @@ -35,11 +35,11 @@ class SvStream; namespace utl { -//= OInputStreamWrapper +// workaround for incremental linking bugs in MSVC2015 +class SAL_DLLPUBLIC_TEMPLATE OInputStreamWrapper_Base : public cppu::WeakImplHelper< css::io::XInputStream > {}; /// helper class for wrapping an SvStream into an com.sun.star.io::XInputStream -class UNOTOOLS_DLLPUBLIC OInputStreamWrapper - : public cppu::WeakImplHelper<css::io::XInputStream> +class UNOTOOLS_DLLPUBLIC OInputStreamWrapper : public OInputStreamWrapper_Base { protected: ::osl::Mutex m_aMutex; |