[Libreoffice-commits] libcdr.git: m4/ax_cxx_compile_stdcxx.m4

Miklos Vajna vmiklos at collabora.co.uk
Sun Sep 10 14:52:51 UTC 2017


 m4/ax_cxx_compile_stdcxx.m4 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1377c874309ccfb8afcf33a73ca561f1827d95fd
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Wed Aug 2 14:53:36 2017 +0200

    m4: MSVC defines __cplusplus as 199711L still
    
    See e.g.
    <https://stackoverflow.com/questions/37503029/cplusplus-is-equal-to-199711-in-msvc-does-it-support-c11>,
    on MSVC we can't depend on the value of __cplusplus, since that one is a
    too low value, even if everything else works fine.

diff --git a/m4/ax_cxx_compile_stdcxx.m4 b/m4/ax_cxx_compile_stdcxx.m4
index 5032bba..acc0db2 100644
--- a/m4/ax_cxx_compile_stdcxx.m4
+++ b/m4/ax_cxx_compile_stdcxx.m4
@@ -174,7 +174,7 @@ m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_11], [[
 
 #error "This is not a C++ compiler"
 
-#elif __cplusplus < 201103L
+#elif __cplusplus < 201103L && !(defined _MSC_VER)
 
 #error "This is not a C++11 compiler"
 


More information about the Libreoffice-commits mailing list