diff options
| -rw-r--r-- | config_host/config_global.h.in | 4 | ||||
| -rw-r--r-- | configure.ac | 15 | ||||
| -rw-r--r-- | editeng/source/editeng/editeng.cxx | 5 |
3 files changed, 24 insertions, 0 deletions
diff --git a/config_host/config_global.h.in b/config_host/config_global.h.in index e0dc1418e9cb..d070373b4350 100644 --- a/config_host/config_global.h.in +++ b/config_host/config_global.h.in @@ -23,4 +23,8 @@ Any change in this header will cause a rebuild of almost everything. /* Compiler supports __attribute__((warn_unused)). */ #define HAVE_GCC_ATTRIBUTE_WARN_UNUSED 0 +/* GCC bug <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=87150> "move ctor wrongly chosen in return + stmt (derived vs. base)": */ +#define HAVE_GCC_BUG_87150 0 + #endif diff --git a/configure.ac b/configure.ac index 795712ea084e..5fb500c7fafa 100644 --- a/configure.ac +++ b/configure.ac @@ -6191,6 +6191,21 @@ if test "$GCC" = yes; then fi AC_SUBST([HAVE_GCC_FNO_SIZED_DEALLOCATION]) +AC_MSG_CHECKING([whether $CXX has GCC bug 87150]) +AC_LANG_PUSH([C++]) +save_CXXFLAGS=$CXXFLAGS +CXXFLAGS="$CXXFLAGS $CXXFLAGS_CXX11" +AC_COMPILE_IFELSE([AC_LANG_SOURCE([ + struct S1 { S1(S1 &&); }; + struct S2: S1 {}; + S1 f(S2 s) { return s; } + ])], [ + AC_DEFINE([HAVE_GCC_BUG_87150],[1]) + AC_MSG_RESULT([yes]) + ], [AC_MSG_RESULT([no])]) +CXXFLAGS=$save_CXXFLAGS +AC_LANG_POP([C++]) + dnl =================================================================== dnl system stl sanity tests dnl =================================================================== diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx index 6116d702242b..01b00ece1297 100644 --- a/editeng/source/editeng/editeng.cxx +++ b/editeng/source/editeng/editeng.cxx @@ -19,6 +19,7 @@ #include <memory> #include <comphelper/lok.hxx> +#include <config_global.h> #include <vcl/wrkwin.hxx> #include <vcl/dialog.hxx> #include <vcl/msgbox.hxx> @@ -2624,7 +2625,11 @@ vcl::Font EditEngine::CreateFontFromItemSet( const SfxItemSet& rItemSet, SvtScri { SvxFont aFont; CreateFont( aFont, rItemSet, true, nScriptType ); +#if HAVE_GCC_BUG_87150 + return aFont; +#else return std::move(aFont); +#endif } SvxFont EditEngine::CreateSvxFontFromItemSet( const SfxItemSet& rItemSet ) |