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

[features.git] / 3rdparty / nod / nod.hpp

diff --git a/3rdparty/nod/nod.hpp b/3rdparty/nod/nod.hpp
index 5c4a93cb8593277cef484c1085b6abd4909879d7..4cc18fe1b8a0c2c70eb02dc892a8aca19cda032f 100644 (file)
--- 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
                        //