[Libreoffice-commits] core.git: configure.ac

[Stephan Bergmann]

 configure.ac |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 75b079201b479fbc448f41427106a52b4e06e445
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Mar 20 10:47:21 2017 +0100

    Fix HAVE_CXX14_CONSTEXPR check for (at least) Clang 3.9.1
    
    ...which appears to happily accept complex C++14-style constexpr function
    definitions, and only complains if such a function call is then used in a
    constant expression context.
    
    Change-Id: I8f7efd7f0af7b1b98d78840cebfeda8bc96e15d0

diff --git a/configure.ac b/configure.ac
index 22c0f09dc750..b50b44521725 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6216,9 +6216,11 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
             int n = n_;
             int i = 0;
             while (n > 0) { --n; ++i; }
+            assert(i >= 0);
             return i == 0;
         }
     };
+    constexpr auto v2 = S{10}.f();
     ]])], [cxx14_constexpr=yes], [cxx14_constexpr=no])
 AC_LANG_POP([C++])
 CXXFLAGS=$save_CXXFLAGS