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/comphelper | |
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/comphelper')
-rw-r--r-- | include/comphelper/ChainablePropertySetInfo.hxx | 6 | ||||
-rw-r--r-- | include/comphelper/MasterPropertySetInfo.hxx | 6 | ||||
-rw-r--r-- | include/comphelper/containermultiplexer.hxx | 6 |
3 files changed, 12 insertions, 6 deletions
diff --git a/include/comphelper/ChainablePropertySetInfo.hxx b/include/comphelper/ChainablePropertySetInfo.hxx index b7807c74fec4..16bfced1376b 100644 --- a/include/comphelper/ChainablePropertySetInfo.hxx +++ b/include/comphelper/ChainablePropertySetInfo.hxx @@ -33,8 +33,10 @@ */ namespace comphelper { - class COMPHELPER_DLLPUBLIC ChainablePropertySetInfo: - public ::cppu::WeakImplHelper< css::beans::XPropertySetInfo > + // workaround for incremental linking bugs in MSVC2015 + class SAL_DLLPUBLIC_TEMPLATE ChainablePropertySetInfo_Base : public cppu::WeakImplHelper< css::beans::XPropertySetInfo > {}; + + class COMPHELPER_DLLPUBLIC ChainablePropertySetInfo : public ChainablePropertySetInfo_Base { public: ChainablePropertySetInfo( PropertyInfo const * pMap ); diff --git a/include/comphelper/MasterPropertySetInfo.hxx b/include/comphelper/MasterPropertySetInfo.hxx index 07416c79c633..8559b2e2fd45 100644 --- a/include/comphelper/MasterPropertySetInfo.hxx +++ b/include/comphelper/MasterPropertySetInfo.hxx @@ -26,8 +26,10 @@ namespace comphelper { - class COMPHELPER_DLLPUBLIC MasterPropertySetInfo: - public ::cppu::WeakImplHelper< css::beans::XPropertySetInfo > + // workaround for incremental linking bugs in MSVC2015 + class SAL_DLLPUBLIC_TEMPLATE MasterPropertySetInfo_Base : public cppu::WeakImplHelper< css::beans::XPropertySetInfo > {}; + + class COMPHELPER_DLLPUBLIC MasterPropertySetInfo : public MasterPropertySetInfo_Base { public: MasterPropertySetInfo( PropertyInfo const * pMap ); diff --git a/include/comphelper/containermultiplexer.hxx b/include/comphelper/containermultiplexer.hxx index 0a3729a5809b..a896c690d530 100644 --- a/include/comphelper/containermultiplexer.hxx +++ b/include/comphelper/containermultiplexer.hxx @@ -64,8 +64,10 @@ namespace comphelper void setAdapter(OContainerListenerAdapter* _pAdapter); }; - class COMPHELPER_DLLPUBLIC OContainerListenerAdapter - : public cppu::WeakImplHelper<css::container::XContainerListener> + // workaround for incremental linking bugs in MSVC2015 + class SAL_DLLPUBLIC_TEMPLATE OContainerListenerAdapter_Base : public cppu::WeakImplHelper< css::container::XContainerListener > {}; + + class COMPHELPER_DLLPUBLIC OContainerListenerAdapter : public OContainerListenerAdapter_Base { friend class OContainerListener; |