diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2015-09-06 21:33:15 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-09-09 14:55:06 +0000 |
| commit | 98483599b76fe6d0113a657f057ff5ad799ade96 (patch) | |
| tree | e41729cc04b852bbb1bac9762669bc9af991fa9b /sw/inc/calbck.hxx | |
| parent | 1544d1257582af96bee633e2ce1ab2b39b4de7d1 (diff) | |
sw: Help vs 2015 with virtual base inheritance
MSVC 14.0 was failing to compile IMark class an friends with:
error C2280: 'SwModify &SwModify::operator =(const SwModify &)':
attempting to reference a deleted function: [1].
After defining copy ctor and assignment operator in SwModify and
derived classes as deleted the next failure was:
error C2512: 'sw::mark::IMark::IMark': no appropriate default
constructor available: [2].
Defining default ctor as default in IMark and derived classes
seems to make all compilers happy.
[1] http://paste.openstack.org/show/447854
[2] http://paste.openstack.org/show/447856
Change-Id: I2822e8ec4b98ca18d0a0128ed2ceeb38f347c5bf
Reviewed-on: https://gerrit.libreoffice.org/18362
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'sw/inc/calbck.hxx')
| -rw-r--r-- | sw/inc/calbck.hxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sw/inc/calbck.hxx b/sw/inc/calbck.hxx index 6313b167bde6..f4eb80690fc7 100644 --- a/sw/inc/calbck.hxx +++ b/sw/inc/calbck.hxx @@ -158,6 +158,8 @@ class SW_DLLPUBLIC SwModify: public SwClient virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE { NotifyClients( pOld, pNew ); }; + SwModify(SwModify&) = delete; + SwModify &operator =(const SwModify&) = delete; public: SwModify() : SwClient(nullptr), m_pWriterListeners(nullptr), m_bModifyLocked(false), bLockClientList(false), m_bInDocDTOR(false), m_bInCache(false), m_bInSwFntCache(false) |