From: Yuriy Skalko <yuriy.skalko@gmail.com>
Date: Tue, 29 Dec 2020 23:35:25 +0000 (+0200)
Subject: Replace deprecated std::result_of, make nod library compatible with C++20
X-Git-Tag: 2.4.0-alpha3~411
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=a2c126f867e12ae166c64fd625101c3c49ee2933;p=lyx.git

Replace deprecated std::result_of, make nod library compatible with C++20
---

diff --git a/3rdparty/nod/nod.hpp b/3rdparty/nod/nod.hpp
index 5c4a93cb85..4cc18fe1b8 100644
--- a/3rdparty/nod/nod.hpp
+++ b/3rdparty/nod/nod.hpp
@@ -269,7 +269,11 @@ namespace nod {
 	{
 		public:
 			/// Result type when calling the accumulating function operator.
+#if __cplusplus >= 201703L
+			using result_type = typename std::invoke_result<F, T, typename S::slot_type::result_type>::type;
+#else
 			using result_type = typename std::result_of<F(T, typename S::slot_type::result_type)>::type;
+#endif
 
 			/// Construct a signal_accumulator as a proxy to a given signal
 			//