diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-12-07 12:32:43 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-12-07 22:48:12 +0100 |
| commit | 6896184167ad084fad298ababff7e6d026d0b929 (patch) | |
| tree | 2bfbb7ca0754e90712725a4d9b6906abe62c9cc3 /configure.ac | |
| parent | 66ef8ca217680095d8aaae025d82c2cbcd8ec1d2 (diff) | |
HAVE_CXX_CWG1579_FIX is always true now
...(according to
<http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#1579> it is fixed
in C++14), but for safety, leave the configure.ac check in for some longer.
Change-Id: Ibd2f0cac228117e35ac299e2fe74207394c900cd
Reviewed-on: https://gerrit.libreoffice.org/64773
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index b7b3b03b90cb..f05c84110f4f 100644 --- a/configure.ac +++ b/configure.ac @@ -6499,7 +6499,8 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([ CXXFLAGS=$save_CXXFLAGS AC_LANG_POP([C++]) -AC_MSG_CHECKING([whether $CXX has a fix for CWG1579]) +dnl This check can eventually be removed completely (e.g., after libreoffice-6-3 branch off): +AC_MSG_CHECKING([that $CXX has a fix for CWG1579]) AC_LANG_PUSH([C++]) save_CXXFLAGS=$CXXFLAGS CXXFLAGS="$CXXFLAGS $CXXFLAGS_CXX11" @@ -6511,10 +6512,8 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([ std::unique_ptr<S2> s2(new S2); return s2; } - ])], [ - AC_DEFINE([HAVE_CXX_CWG1579_FIX],[1]) - AC_MSG_RESULT([yes]) - ], [AC_MSG_RESULT([no])]) + ])], + AC_MSG_RESULT([yes]), AC_MSG_ERROR([$CXX lacks a required fix for CWG1579])) CXXFLAGS=$save_CXXFLAGS AC_LANG_POP([C++]) |