diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-08-28 22:24:19 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-08-29 08:59:15 +0200 |
| commit | dc06c8f4989fc28d0c31ebd333e53dfe0e0f5f66 (patch) | |
| tree | 286085623ca33bd12bb5a44dbeacc86c8fb332df /drawinglayer | |
| parent | d8d310dcac8ddfdb16756cc863552ef788cfc393 (diff) | |
-Werror=redundant-move (GCC 9), take two
...after 5b62a43349da6fda13fb33e0f1ec477c21daec8f "Revert
'-Werror=redundant-move'" to fix the build for GCC 8.1 again. Turns out the
std::move can only be dropped if the compiler has a fix for CWG1579. For GCC
that's the case starting with GCC 5.1, so the !HAVE_CXX_GWG1579_FIX case can
hopefully be removed again soon, see the mail thread starting at
<https://lists.freedesktop.org/archives/libreoffice/2018-July/080588.html>
"Compiler baselines (was: [Libreoffice-qa] minutes of ESC call ...)").
Change-Id: I3592cad7fb503db921c37e92831a34785a1054a1
Reviewed-on: https://gerrit.libreoffice.org/59741
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'drawinglayer')
| -rw-r--r-- | drawinglayer/source/animation/animationtiming.cxx | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drawinglayer/source/animation/animationtiming.cxx b/drawinglayer/source/animation/animationtiming.cxx index db629aa8d31f..374def8aed6e 100644 --- a/drawinglayer/source/animation/animationtiming.cxx +++ b/drawinglayer/source/animation/animationtiming.cxx @@ -18,6 +18,8 @@ */ #include <memory> + +#include <config_global.h> #include <drawinglayer/animation/animationtiming.hxx> #include <basegfx/numeric/ftools.hxx> #include <o3tl/make_unique.hxx> @@ -190,7 +192,11 @@ namespace drawinglayer pNew->append(*i); } +#if HAVE_CXX_CWG1579_FIX + return pNew; +#else return std::move(pNew); +#endif } bool AnimationEntryList::operator==(const AnimationEntry& rCandidate) const @@ -283,7 +289,11 @@ namespace drawinglayer pNew->append(*i); } +#if HAVE_CXX_CWG1579_FIX + return pNew; +#else return std::move(pNew); +#endif } bool AnimationEntryLoop::operator==(const AnimationEntry& rCandidate) const |