From a2c126f867e12ae166c64fd625101c3c49ee2933 Mon Sep 17 00:00:00 2001 From: Yuriy Skalko Date: Wed, 30 Dec 2020 01:35:25 +0200 Subject: [PATCH] Replace deprecated std::result_of, make nod library compatible with C++20 --- 3rdparty/nod/nod.hpp | 4 ++++ 1 file changed, 4 insertions(+) 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::type; +#else using result_type = typename std::result_of::type; +#endif /// Construct a signal_accumulator as a proxy to a given signal //