Fix compilation with MSVC 19.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 91dd05a5475472b8c9d62a46112d940d75f4f37f..65d3a6e06ef9a998b2a129232a8dfd71851e2f73 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1069,6 +1069,13 @@ if(MSVC)
                set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} /Zc:wchar_t-")
        endif()
 
+       if (MSVC_VERSION GREATER_EQUAL 1914)
+               # Ensure the __cplusplus macro is set to a sensible value.
+               set(CMAKE_CXX_FLAGS_DEBUG      "${CMAKE_CXX_FLAGS_DEBUG} /Zc:__cplusplus")
+               set(CMAKE_CXX_FLAGS_RELEASE    "${CMAKE_CXX_FLAGS_RELEASE} /Zc:__cplusplus")
+               set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} /Zc:__cplusplus")
+       endif()
+
        message(STATUS "----- Warning level      : ${CMAKE_CXX_WARNING_LEVEL}  ${WARNING_LEVEL_MESSAGE}")
        message(STATUS "----- Warnings as errors : ${MSVC_W_ERROR}")
        message(STATUS "----- Warnings disabled  : ${MSVC_W_DISABLE}")

diff --git a/src/support/RandomAccessList.h b/src/support/RandomAccessList.h
index 0eaa52a480e7f450c76601883a923ceb80ffca70..644fee68ae26172af51c1758690ce0b128822fd1 100644 (file)
--- a/src/support/RandomAccessList.h
+++ b/src/support/RandomAccessList.h
@@ -296,7 +296,7 @@ public:
 
        const_iterator iterator_at(size_t i) const
        {
-               return (i == size()) ? end() : iterCont_[i];
+               return (i == size()) ? end() : const_iterator(iterCont_[i]);
        }
 
        iterator iterator_at(size_t i)