diff options
| author | root <root@rshg054.dnsready.net> | 2013-05-11 01:48:19 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-05-11 01:48:19 -0700 |
| commit | 207b7c7b0d7bc0db898a2386a665bdb20495fb19 (patch) | |
| tree | 972e21e2c70df56034182bfc0bf6ccbebab104b7 /extra/libreoffice/gcc48_5.diff | |
| parent | fc7ee6f5a358c428577ae4e6217ff594a3e45ad3 (diff) | |
Sat May 11 01:48:09 PDT 2013
Diffstat (limited to 'extra/libreoffice/gcc48_5.diff')
| -rw-r--r-- | extra/libreoffice/gcc48_5.diff | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/extra/libreoffice/gcc48_5.diff b/extra/libreoffice/gcc48_5.diff deleted file mode 100644 index f63571039..000000000 --- a/extra/libreoffice/gcc48_5.diff +++ /dev/null @@ -1,34 +0,0 @@ -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 |