diff --git a/CMakeLists.txt b/CMakeLists.txt
index 23bd0bcad..fb135888b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.18)
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
diff --git a/cmake/warnings.cmake b/cmake/warnings.cmake
index ad9cfb086..bdea06cef 100644
--- a/cmake/warnings.cmake
+++ b/cmake/warnings.cmake
@@ -90,4 +90,5 @@ no_warning(float-conversion)
 no_warning(sign-conversion)
 no_warning(shorten-64-to-32)
 no_warning(padded)
-no_warning(missing-noreturn)
\ No newline at end of file
+no_warning(missing-noreturn)
+no_warning(deprecated-comma-subscript)
diff --git a/third_party/variant/include/mapbox/variant.hpp b/third_party/variant/include/mapbox/variant.hpp
index fb0f77e6d..91ec1dacb 100644
--- a/third_party/variant/include/mapbox/variant.hpp
+++ b/third_party/variant/include/mapbox/variant.hpp
@@ -163,7 +163,7 @@ struct enable_if_type
 template <typename F, typename V, typename Enable = void>
 struct result_of_unary_visit
 {
-    using type = typename std::result_of<F(V&)>::type;
+    using type = std::invoke_result_t<F, V&>;
 };
 
 template <typename F, typename V>
@@ -175,7 +175,7 @@ struct result_of_unary_visit<F, V, typename enable_if_type<typename F::result_ty
 template <typename F, typename V, typename Enable = void>
 struct result_of_binary_visit
 {
-    using type = typename std::result_of<F(V&, V&)>::type;
+    using type = std::invoke_result_t<F, V&, V&>;
 };
 
 template <typename F, typename V>