Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion cmake/modules/CheckCompiler.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,11 @@ endif()
# so we check the value of __cplusplus.
# This default value can be overridden by specifying one at the prompt.
if (MSVC)
set(CXX_STANDARD_STRING "201703L")
if(MSVC_VERSION GREATER_EQUAL 1950)
set(CXX_STANDARD_STRING "202002L")
else()
set(CXX_STANDARD_STRING "201703L")
endif()
else()
execute_process(COMMAND echo __cplusplus
COMMAND ${CMAKE_CXX_COMPILER} -E -x c++ -
Expand Down
1 change: 1 addition & 0 deletions io/io/test/TFileTests.cxx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#include <memory>
#include <vector>
#include <string>
#include <array>

#include "gtest/gtest.h"

Expand Down
1 change: 1 addition & 0 deletions roottest/root/io/evolution/rules/execSourceTypes.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include <type_traits>
#include <list>
#include <string>
#include <array>

struct A {
float f = 1.1;
Expand Down
Loading