Remove usage of deprecated std::result_of

Author: sergcpp

CMakeLists.txt

@@ -178,7 +178,7 @@ if(ENABLE_DX_IMPL AND WIN32)
     )
 endif(ENABLE_DX_IMPL AND WIN32)
 
-if(NOT CMAKE_GENERATOR_PLATFORM MATCHES "ARM64" AND NOT CMAKE_APPLE_SILICON_PROCESSOR STREQUAL "arm64")
+if(NOT "${CMAKE_GENERATOR_PLATFORM}" STREQUAL "ARM64" AND NOT "${CMAKE_APPLE_SILICON_PROCESSOR}" STREQUAL "arm64")
     if(MSVC)
         if(NOT CMAKE_CL_64)
             set_source_files_properties(internal/TextureUtilsSSE2.cpp PROPERTIES COMPILE_FLAGS /arch:SSE2)
@@ -199,7 +199,7 @@ if(NOT CMAKE_GENERATOR_PLATFORM MATCHES "ARM64" AND NOT CMAKE_APPLE_SILICON_PROC
         set_source_files_properties(internal/RendererAVX2.cpp PROPERTIES COMPILE_FLAGS "-mavx2 -mfma")
         set_source_files_properties(internal/RendererAVX512.cpp PROPERTIES COMPILE_FLAGS "-mavx2 -mfma -mavx512f -mavx512bw -mavx512dq -mavx512vl")
     endif()
-endif(NOT CMAKE_GENERATOR_PLATFORM MATCHES "ARM64" AND NOT CMAKE_APPLE_SILICON_PROCESSOR STREQUAL "arm64")
+endif(NOT "${CMAKE_GENERATOR_PLATFORM}" STREQUAL "ARM64" AND NOT "${CMAKE_APPLE_SILICON_PROCESSOR}" STREQUAL "arm64")
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/Config.h)
 

tests/CMakeLists.txt

@@ -47,7 +47,7 @@ if (MSVC)
     set_source_files_properties(test_simd.cpp PROPERTIES COMPILE_FLAGS /Ob0)
 endif()
 
-if(NOT "${CMAKE_GENERATOR_PLATFORM}" STREQUAL "ARM64" AND NOT CMAKE_APPLE_SILICON_PROCESSOR STREQUAL "arm64")
+if(NOT "${CMAKE_GENERATOR_PLATFORM}" STREQUAL "ARM64" AND NOT "${CMAKE_APPLE_SILICON_PROCESSOR}" STREQUAL "arm64")
     if (MSVC)
         if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
             set_source_files_properties(test_simd_sse41.cpp PROPERTIES COMPILE_FLAGS -msse4.1)
@@ -63,7 +63,7 @@ if(NOT "${CMAKE_GENERATOR_PLATFORM}" STREQUAL "ARM64" AND NOT CMAKE_APPLE_SILICO
         set_source_files_properties(test_simd_avx2.cpp PROPERTIES COMPILE_FLAGS "-mavx2 -mfma")
         set_source_files_properties(test_simd_avx512.cpp PROPERTIES COMPILE_FLAGS "-mavx2 -mfma -mavx512f -mavx512bw -mavx512dq -mavx512vl")
     endif()
-endif(NOT "${CMAKE_GENERATOR_PLATFORM}" STREQUAL "ARM64" AND NOT CMAKE_APPLE_SILICON_PROCESSOR STREQUAL "arm64")
+endif(NOT "${CMAKE_GENERATOR_PLATFORM}" STREQUAL "ARM64" AND NOT "${CMAKE_APPLE_SILICON_PROCESSOR}" STREQUAL "arm64")
 
 target_link_libraries(test_Ray Ray ${LIBS})
 

tests/thread_pool.h

@@ -21,7 +21,7 @@ class ThreadPool {
     ~ThreadPool();
 
     template <class F, class... Args>
-    std::future<typename std::result_of<F(Args...)>::type> Enqueue(F &&f, Args &&... args);
+    std::future<typename std::invoke_result_t<F, Args...>> Enqueue(F &&f, Args &&...args);
 
     template <class UnaryFunction> void ParallelFor(int from, int to, UnaryFunction &&f);
 
@@ -63,8 +63,8 @@ inline ThreadPool::ThreadPool(const size_t threads_count) : stop_(false) {
 
 // add new work item to the pool
 template <class F, class... Args>
-std::future<typename std::result_of<F(Args...)>::type> ThreadPool::Enqueue(F &&f, Args &&... args) {
-    using return_type = typename std::result_of<F(Args...)>::type;
+std::future<typename std::invoke_result_t<F, Args...>> ThreadPool::Enqueue(F &&f, Args &&...args) {
+    using return_type = typename std::invoke_result_t<F, Args...>;
 
     auto task =
         std::make_shared<std::packaged_task<return_type()>>(std::bind(std::forward<F>(f), std::forward<Args>(args)...));