Add updated invoke_result_t check for ndk 16

Same as on the core
edo9300 · Sep 6, 2024 · 59896f5 · 59896f5
1 parent b15c233
commit 59896f5
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/gframe/generic_duel.h b/gframe/generic_duel.h
@@ -1,7 +1,6 @@
 #ifndef GENERIC_DUEL_H
 #define GENERIC_DUEL_H
 
-#include <functional>
 #include <cstdint>
 #include <set>
 #include <type_traits>
@@ -47,12 +46,12 @@ class GenericDuel final : public DuelMode {
 	void RefreshExtra(uint8_t player, uint32_t flag = 0x381fff);
 	void RefreshLocation(uint8_t player, uint32_t flag, uint8_t location);
 	void RefreshSingle(uint8_t player, uint8_t location, uint8_t sequence, uint32_t flag = 0x3f81fff);
-	
+
 	static void GenericTimer(evutil_socket_t fd, short events, void* arg);
 
 	void PseudoRefreshDeck(uint8_t player, uint32_t flag = 0x1181fff);
 	static ReplayStream replay_stream;
-	
+
 protected:
 	std::vector<CoreUtils::Packet> packets_cache;
 	class duelist {
@@ -95,7 +94,8 @@ class GenericDuel final : public DuelMode {
 		}
 	}
 
-#if (defined(_MSVC_LANG) && _MSVC_LANG >= 201703L) || __cplusplus >= 201703L
+#if (!defined(_LIBCPP_VERSION) || _LIBCPP_VERSION >= 7000) && \
+	((defined(_MSVC_LANG) && _MSVC_LANG >= 201703L) || __cplusplus >= 201703L)
 	template<typename T, typename... Arg>
 	using FunctionResult = std::invoke_result_t<T, Arg...>;
 #else