diff --git a/vtkm/thirdparty/diy/vtkmdiy/CMakeLists.txt b/vtkm/thirdparty/diy/vtkmdiy/CMakeLists.txt index 420b1aa6f..46861ebdc 100644 --- a/vtkm/thirdparty/diy/vtkmdiy/CMakeLists.txt +++ b/vtkm/thirdparty/diy/vtkmdiy/CMakeLists.txt @@ -143,7 +143,7 @@ function(add_diy_mpi_library use_mpi) add_library(${lib_name} ${sources}) set_target_properties(${lib_name} PROPERTIES POSITION_INDEPENDENT_CODE ON) - target_compile_features(${lib_name} PRIVATE cxx_std_11) + target_compile_features(${lib_name} PRIVATE cxx_std_14) target_compile_definitions(${lib_name} PRIVATE -DVTKMDIY_HAS_MPI=${has_mpi_val} PRIVATE -Ddiy=${diy_prefix} # mangle diy namespace @@ -186,7 +186,7 @@ if (build_diy_mpi_lib) endif() # build_diy_mpi_lib add_library(${diy_prefix} INTERFACE) -target_compile_features(${diy_prefix} INTERFACE cxx_std_11) +target_compile_features(${diy_prefix} INTERFACE cxx_std_14) target_compile_definitions(${diy_prefix} INTERFACE ${diy_definitions}) target_include_directories(${diy_prefix} SYSTEM INTERFACE "$" diff --git a/vtkm/thirdparty/diy/vtkmdiy/include/vtkmdiy/thirdparty/fmt/format.h b/vtkm/thirdparty/diy/vtkmdiy/include/vtkmdiy/thirdparty/fmt/format.h index dcf4a3998..ce5d0695e 100644 --- a/vtkm/thirdparty/diy/vtkmdiy/include/vtkmdiy/thirdparty/fmt/format.h +++ b/vtkm/thirdparty/diy/vtkmdiy/include/vtkmdiy/thirdparty/fmt/format.h @@ -850,7 +850,7 @@ inline Char* format_uint(Char* buffer, UInt value, int num_digits, buffer += num_digits; Char* end = buffer; do { - const char* digits = upper ? "0123456789ABCDEF" : data::hex_digits; + const char* digits = upper ? "0123456789ABCDEF" : "0123456789abcdef"; unsigned digit = (value & ((1 << BASE_BITS) - 1)); *--buffer = static_cast(BASE_BITS < 4 ? static_cast('0' + digit) : digits[digit]);