summaryrefslogtreecommitdiff
path: root/cppcanvas
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2018-10-02 17:28:15 +0200
committerStephan Bergmann <sbergman@redhat.com>2018-10-02 21:54:00 +0200
commit3db830d354de80b319fb818a0373365a1e647264 (patch)
tree7b8abc09ad3d5f44c05b440c12ff4238c7e86f15 /cppcanvas
parent22c3b4077f5f113f8208bb03b853eb3befafff51 (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 'cppcanvas')
-rw-r--r--cppcanvas/source/wrapper/implbitmapcanvas.hxx4
-rw-r--r--cppcanvas/source/wrapper/implcanvas.hxx4
2 files changed, 4 insertions, 4 deletions
diff --git a/cppcanvas/source/wrapper/implbitmapcanvas.hxx b/cppcanvas/source/wrapper/implbitmapcanvas.hxx
index f2ccaf42153d..628be99d0b38 100644
--- a/cppcanvas/source/wrapper/implbitmapcanvas.hxx
+++ b/cppcanvas/source/wrapper/implbitmapcanvas.hxx
@@ -41,8 +41,8 @@ namespace cppcanvas
ImplBitmapCanvas(ImplBitmapCanvas const &) = default;
ImplBitmapCanvas(ImplBitmapCanvas &&) = default;
- ImplBitmapCanvas & operator =(ImplBitmapCanvas const &) = default;
- ImplBitmapCanvas & operator =(ImplBitmapCanvas &&) = default;
+ ImplBitmapCanvas & operator =(ImplBitmapCanvas const &) = delete; // due to const mxBitmapCanvas
+ ImplBitmapCanvas & operator =(ImplBitmapCanvas &&) = delete; // due to const mxBitmapCanvas
virtual ::basegfx::B2ISize getSize() const override;
diff --git a/cppcanvas/source/wrapper/implcanvas.hxx b/cppcanvas/source/wrapper/implcanvas.hxx
index b6f8d02da87c..2f8da62e4f0e 100644
--- a/cppcanvas/source/wrapper/implcanvas.hxx
+++ b/cppcanvas/source/wrapper/implcanvas.hxx
@@ -55,8 +55,8 @@ namespace cppcanvas
ImplCanvas(ImplCanvas const &) = default;
ImplCanvas(ImplCanvas &&) = default;
- ImplCanvas & operator =(ImplCanvas const &) = default;
- ImplCanvas & operator =(ImplCanvas &&) = default;
+ ImplCanvas & operator =(ImplCanvas const &) = delete; // due to const mxCanvas
+ ImplCanvas & operator =(ImplCanvas &&) = delete; // due to const mxCanvas
virtual void setTransformation( const ::basegfx::B2DHomMatrix& rMatrix ) override;
virtual ::basegfx::B2DHomMatrix getTransformation() const override;