diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-10-02 17:28:15 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-10-02 21:54:00 +0200 |
| commit | 3db830d354de80b319fb818a0373365a1e647264 (patch) | |
| tree | 7b8abc09ad3d5f44c05b440c12ff4238c7e86f15 /sw/source | |
| parent | 22c3b4077f5f113f8208bb03b853eb3befafff51 (diff) | |
Silence new Clang trunk -Wdefaulted-function-deleted
This mostly affects explicitly defaulted functions that had recently been user-
declared to silence new GCC trunk -Wdeprecated-copy. It is not entirely clear
to me what the best approach is overall, see my mail
<http://lists.llvm.org/pipermail/cfe-commits/Week-of-Mon-20181001/245321.html>
"Re: r343285 - [cxx2a] P0641R2: (Some) type mismatches on defaulted functions
only", but lets just explicitly delete those functions for now.
Change-Id: If8c72f612f67a8feb8b03c2fb988c807e704ef03
Reviewed-on: https://gerrit.libreoffice.org/61259
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/filter/ww8/ww8par.hxx | 4 | ||||
| -rw-r--r-- | sw/source/uibase/inc/uiitems.hxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index 74fbfcecec31..1387ad1b5c6f 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -506,8 +506,8 @@ public: SwMacroInfo(SwMacroInfo const &) = default; SwMacroInfo(SwMacroInfo &&) = default; - SwMacroInfo & operator =(SwMacroInfo const &) = default; - SwMacroInfo & operator =(SwMacroInfo &&) = default; + SwMacroInfo & operator =(SwMacroInfo const &) = delete; // due to SdrObjUserData + SwMacroInfo & operator =(SwMacroInfo &&) = delete; // due to SdrObjUserData virtual std::unique_ptr<SdrObjUserData> Clone( SdrObject* pObj ) const override; diff --git a/sw/source/uibase/inc/uiitems.hxx b/sw/source/uibase/inc/uiitems.hxx index 66baa0e306d2..deac6631a37a 100644 --- a/sw/source/uibase/inc/uiitems.hxx +++ b/sw/source/uibase/inc/uiitems.hxx @@ -41,8 +41,8 @@ public: SwPageFootnoteInfoItem(SwPageFootnoteInfoItem const &) = default; SwPageFootnoteInfoItem(SwPageFootnoteInfoItem &&) = default; - SwPageFootnoteInfoItem & operator =(SwPageFootnoteInfoItem const &) = default; - SwPageFootnoteInfoItem & operator =(SwPageFootnoteInfoItem &&) = default; + SwPageFootnoteInfoItem & operator =(SwPageFootnoteInfoItem const &) = delete; // due to SfxPoolItem + SwPageFootnoteInfoItem & operator =(SwPageFootnoteInfoItem &&) = delete; // due to SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; |