diff --git a/include/util/static_assert.hpp b/include/util/static_assert.hpp index ea6bc3814..28e922fd3 100644 --- a/include/util/static_assert.hpp +++ b/include/util/static_assert.hpp @@ -15,7 +15,7 @@ template inline void static_assert_iter_value() template inline void static_assert_iter_category() { using IterCategoryType = typename std::iterator_traits::iterator_category; - static_assert(std::is_base_of::value, ""); + static_assert(std::is_base_of_v, ""); } } // namespace osrm::util diff --git a/third_party/variant/include/mapbox/variant.hpp b/third_party/variant/include/mapbox/variant.hpp index 91ec1dacb..396b4a9eb 100644 --- a/third_party/variant/include/mapbox/variant.hpp +++ b/third_party/variant/include/mapbox/variant.hpp @@ -163,7 +163,11 @@ struct enable_if_type template struct result_of_unary_visit { +#if __cplusplus >= 201703L using type = std::invoke_result_t; +#else + using type = std::result_of_t; +#endif }; template @@ -175,7 +179,11 @@ struct result_of_unary_visit struct result_of_binary_visit { +#if __cplusplus >= 201703L using type = std::invoke_result_t; +#else + using type = std::result_of_t; +#endif }; template