From 5cc1f98b8ddecffc13cba08a1dc6a0dec180ae25 Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Sun, 13 Aug 2023 11:11:28 +0900
Subject: [PATCH] Remove utils/stdcompat/invoke_result_t.hpp

---
 Source/lighting.h                          | 10 +++++-----
 Source/utils/stdcompat/invoke_result_t.hpp |  7 -------
 2 files changed, 5 insertions(+), 12 deletions(-)
 delete mode 100644 Source/utils/stdcompat/invoke_result_t.hpp

diff --git a/Source/lighting.h b/Source/lighting.h
index b1db36310..cb8c65607 100644
--- a/Source/lighting.h
+++ b/Source/lighting.h
@@ -8,6 +8,7 @@
 #include <array>
 #include <cstdint>
 #include <optional>
+#include <type_traits>
 #include <vector>
 
 #include <function_ref.hpp>
@@ -16,7 +17,6 @@
 #include "engine.h"
 #include "engine/point.hpp"
 #include "utils/attributes.h"
-#include "utils/stdcompat/invoke_result_t.hpp"
 
 namespace devilution {
 
@@ -110,9 +110,9 @@ bool DoCrawl(unsigned radius, tl::function_ref<bool(Displacement)> function);
 bool DoCrawl(unsigned minRadius, unsigned maxRadius, tl::function_ref<bool(Displacement)> function);
 
 template <typename F>
-auto Crawl(unsigned radius, F function) -> invoke_result_t<decltype(function), Displacement>
+auto Crawl(unsigned radius, F function) -> std::invoke_result_t<decltype(function), Displacement>
 {
-	invoke_result_t<decltype(function), Displacement> result;
+	std::invoke_result_t<decltype(function), Displacement> result;
 	DoCrawl(radius, [&result, &function](Displacement displacement) -> bool {
 		result = function(displacement);
 		return !result;
@@ -121,9 +121,9 @@ auto Crawl(unsigned radius, F function) -> invoke_result_t<decltype(function), D
 }
 
 template <typename F>
-auto Crawl(unsigned minRadius, unsigned maxRadius, F function) -> invoke_result_t<decltype(function), Displacement>
+auto Crawl(unsigned minRadius, unsigned maxRadius, F function) -> std::invoke_result_t<decltype(function), Displacement>
 {
-	invoke_result_t<decltype(function), Displacement> result;
+	std::invoke_result_t<decltype(function), Displacement> result;
 	DoCrawl(minRadius, maxRadius, [&result, &function](Displacement displacement) -> bool {
 		result = function(displacement);
 		return !result;
diff --git a/Source/utils/stdcompat/invoke_result_t.hpp b/Source/utils/stdcompat/invoke_result_t.hpp
deleted file mode 100644
index 7d0535cff..000000000
--- a/Source/utils/stdcompat/invoke_result_t.hpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#include <type_traits>
-
-namespace devilution {
-using ::std::invoke_result_t;
-} // namespace devilution