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

[Stephan Bergmann (via logerrit)]

 README.md    |    2 +-
 configure.ac |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit a33469518f840ccf55913ab8c5c88e5e82fbf1bd
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Jan 14 13:07:38 2021 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Thu Jan 14 16:43:04 2021 +0100

    Bump MSVC baseline to Visual Studio 2019 version 16.5
    
    After b4b7e92cbf5a212cc1c648af86df2dee364d48c8 "Use MSVC's /permissive- to make
    it more standards conforming", vmiklos reported that his 16.4.6 build started to
    fail with
    
    > C:/lo/master/connectivity/source/drivers/odbc/OStatement.cxx(411): error C2760: syntax error: unexpected token 'identifier', expected 'type specifier'
    > C:/lo/master/connectivity/source/drivers/odbc/OStatement.cxx(411): note: This diagnostic occurred in the compiler generated function 'T connectivity::odbc::OStatement_Base::getStmtOption(SQLINTEGER) const'
    > C:/lo/master/connectivity/source/drivers/odbc/OStatement.cxx(418): error C2760: syntax error: unexpected token 'identifier', expected 'type specifier'
    > C:/lo/master/connectivity/source/drivers/odbc/OStatement.cxx(418): note: This diagnostic occurred in the compiler generated function 'SQLRETURN connectivity::odbc::OStatement_Base::setStmtOption(SQLINTEGER,T) const'
    > [build CXX] connectivity/source/drivers/odbc/ODatabaseMetaData.cxx
    > make[1]: *** [C:/lo/master/solenv/gbuild/LinkTarget.mk:301: C:/lo/master/workdir/CxxObject/connectivity/source/drivers/odbc/OStatement.o] Error 2
    > make[1]: *** Waiting for unfinished jobs....
    > C:/lo/master/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx(161): error C3861: 'checkDisposed': identifier not found
    > C:/lo/master/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx(161): note: 'checkDisposed': function declaration must be available as none of the arguments depend on a template parameter
    > C:/lo/master/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx(161): note: This diagnostic occurred in the compiler generated function 'T connectivity::odbc::ODatabaseMetaDataResultSet::getInteger(sal_Int32)'
    > make[1]: *** [C:/lo/master/solenv/gbuild/LinkTarget.mk:298: C:/lo/master/workdir/CxxObject/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.o] Error 2
    
    while it succeeded after upgrading to 16.8.4.  That change had been seen working
    with 16.5.4 (on tb73, see
    <https://lists.freedesktop.org/archives/libreoffice/2021-January/086635.html>
    "Heads up: Use MSVC's /permissive- to make it more standards conforming"), so
    lets hope that bumping the baseline from 16.4 to 16.5 is all that is needed.
    
    Change-Id: I7446f778a94e15e7ea5c8ef0780bf10831a2d4b7
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109293
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/README.md b/README.md
index 4ed3b80b2fec..7da780aca76a 100644
--- a/README.md
+++ b/README.md
@@ -36,7 +36,7 @@ run and compile LibreOffice, also used by the TDF builds:
 
 * Windows:
     * Runtime: Windows 7
-    * Build: Cygwin + Visual Studio 2019 version 16.4
+    * Build: Cygwin + Visual Studio 2019 version 16.5
 * macOS:
     * Runtime: 10.10
     * Build: 10.14.4 + Xcode 11.3
diff --git a/configure.ac b/configure.ac
index 562d0141e6cd..7c97317170cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3991,11 +3991,11 @@ if test "$_os" = "WINNT"; then
         AC_MSG_ERROR([Visual C++ not found after all, huh])
     fi
 
-    AC_MSG_CHECKING([$CC_BASE is at least Visual Studio 2019 version 16.4])
+    AC_MSG_CHECKING([$CC_BASE is at least Visual Studio 2019 version 16.5])
     AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
         // See <https://docs.microsoft.com/en-us/cpp/preprocessor/predefined-macros> for mapping
         // between Visual Studio versions and _MSC_VER:
-        #if _MSC_VER < 1924
+        #if _MSC_VER < 1925
         #error
         #endif
     ]])],[AC_MSG_RESULT([yes])],[AC_MSG_ERROR([no])])