summaryrefslogtreecommitdiff
path: root/extra/libreoffice/gcc48_5.diff
blob: f63571039cdea0657ffd959457923164f9ae50fa (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
From 157ce65588ec8ef4ff8f805f7b8a64fefdd9edec Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Fri, 08 Mar 2013 11:07:11 +0000
Subject: Work around GCC 4.8 -Werror=virtual-move-assign

...complaining that "defaulted move assignment for ‘cppcanvas::SpriteCanvas’
calls a non-trivial move assignment operator for virtual base
‘cppcanvas::BitmapCanvas’."

Change-Id: I4dc92176dbec62f0ae4fa7d2842073077ecb8fc3
---
diff --git a/cppcanvas/inc/cppcanvas/spritecanvas.hxx b/cppcanvas/inc/cppcanvas/spritecanvas.hxx
index 59aa3da..6a606b3 100644
--- a/cppcanvas/inc/cppcanvas/spritecanvas.hxx
+++ b/cppcanvas/inc/cppcanvas/spritecanvas.hxx
@@ -24,6 +24,7 @@
 #include <osl/diagnose.h>
 #include <basegfx/vector/b2dsize.hxx>
 
+#include <boost/noncopyable.hpp>
 #include <boost/shared_ptr.hpp>
 
 
@@ -48,7 +49,7 @@ namespace cppcanvas
 
     /** SpriteCanvas interface
      */
-    class SpriteCanvas : public virtual BitmapCanvas
+    class SpriteCanvas : public virtual BitmapCanvas, private boost::noncopyable
     {
     public:
         virtual bool                    updateScreen( bool bUpdateAll ) const = 0;
--
cgit v0.9.0.2-2-gbebe