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/oox | |
| 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/oox')
| -rw-r--r-- | include/oox/core/contexthandler2.hxx | 4 | ||||
| -rw-r--r-- | include/oox/core/fragmenthandler.hxx | 4 | ||||
| -rw-r--r-- | include/oox/core/fragmenthandler2.hxx | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/include/oox/core/contexthandler2.hxx b/include/oox/core/contexthandler2.hxx index 5df9a6b3bd05..27185d732066 100644 --- a/include/oox/core/contexthandler2.hxx +++ b/include/oox/core/contexthandler2.hxx @@ -231,8 +231,8 @@ public: ContextHandler2(ContextHandler2 const &) = default; ContextHandler2(ContextHandler2 &&) = default; - ContextHandler2 & operator =(ContextHandler2 const &) = default; - ContextHandler2 & operator =(ContextHandler2 &&) = default; + ContextHandler2 & operator =(ContextHandler2 const &) = delete; // due to ContextHandler + ContextHandler2 & operator =(ContextHandler2 &&) = delete; // due to ContextHandler // resolve ambiguity from base classes virtual void SAL_CALL acquire() throw() override { ContextHandler::acquire(); } diff --git a/include/oox/core/fragmenthandler.hxx b/include/oox/core/fragmenthandler.hxx index c92cb411a6f9..0a4e9a09ffb7 100644 --- a/include/oox/core/fragmenthandler.hxx +++ b/include/oox/core/fragmenthandler.hxx @@ -95,8 +95,8 @@ public: FragmentHandler(FragmentHandler const &) = default; FragmentHandler(FragmentHandler &&) = default; - FragmentHandler & operator =(FragmentHandler const &) = default; - FragmentHandler & operator =(FragmentHandler &&) = default; + FragmentHandler & operator =(FragmentHandler const &) = delete; // due to ContextHandler + FragmentHandler & operator =(FragmentHandler &&) = delete; // due to ContextHandler /** Returns the com.sun.star.xml.sax.XFastContextHandler interface of this context. */ css::uno::Reference< css::xml::sax::XFastContextHandler > diff --git a/include/oox/core/fragmenthandler2.hxx b/include/oox/core/fragmenthandler2.hxx index 2a262c470646..a08111395e8d 100644 --- a/include/oox/core/fragmenthandler2.hxx +++ b/include/oox/core/fragmenthandler2.hxx @@ -71,8 +71,8 @@ public: FragmentHandler2(FragmentHandler2 const &) = default; FragmentHandler2(FragmentHandler2 &&) = default; - FragmentHandler2 & operator =(FragmentHandler2 const &) = default; - FragmentHandler2 & operator =(FragmentHandler2 &&) = default; + FragmentHandler2 & operator =(FragmentHandler2 const &) = delete; // due to FragmentHandler + FragmentHandler2 & operator =(FragmentHandler2 &&) = delete; // due to FragmentHandler // resolve ambiguity from base classes virtual void SAL_CALL acquire() throw() override { FragmentHandler::acquire(); } |