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 /include/toolkit | |
| 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 'include/toolkit')
| -rw-r--r-- | include/toolkit/controls/dialogcontrol.hxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/toolkit/controls/dialogcontrol.hxx b/include/toolkit/controls/dialogcontrol.hxx index df643f47f450..5783c894be1f 100644 --- a/include/toolkit/controls/dialogcontrol.hxx +++ b/include/toolkit/controls/dialogcontrol.hxx @@ -172,8 +172,8 @@ public: UnoMultiPageModel(UnoMultiPageModel const &) = default; UnoMultiPageModel(UnoMultiPageModel &&) = default; - UnoMultiPageModel & operator =(UnoMultiPageModel const &) = default; - UnoMultiPageModel & operator =(UnoMultiPageModel &&) = default; + UnoMultiPageModel & operator =(UnoMultiPageModel const &) = delete; // due to ControlModelContainerBase + UnoMultiPageModel & operator =(UnoMultiPageModel &&) = delete; // due to ControlModelContainerBase rtl::Reference<UnoControlModel> Clone() const override; @@ -251,8 +251,8 @@ public: UnoPageModel(UnoPageModel const &) = default; UnoPageModel(UnoPageModel &&) = default; - UnoPageModel & operator =(UnoPageModel const &) = default; - UnoPageModel & operator =(UnoPageModel &&) = default; + UnoPageModel & operator =(UnoPageModel const &) = delete; // due to ControlModelContainerBase + UnoPageModel & operator =(UnoPageModel &&) = delete; // due to ControlModelContainerBase rtl::Reference<UnoControlModel> Clone() const override; @@ -289,8 +289,8 @@ public: UnoFrameModel(UnoFrameModel const &) = default; UnoFrameModel(UnoFrameModel &&) = default; - UnoFrameModel & operator =(UnoFrameModel const &) = default; - UnoFrameModel & operator =(UnoFrameModel &&) = default; + UnoFrameModel & operator =(UnoFrameModel const &) = delete; // due to ControlModelContainerBase + UnoFrameModel & operator =(UnoFrameModel &&) = delete; // due to ControlModelContainerBase rtl::Reference<UnoControlModel> Clone() const override; |