mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-24 02:35:20 +00:00
Replace deprecated std::result_of, make nod library compatible with C++20
This commit is contained in:
parent
f7772849b9
commit
a2c126f867
4
3rdparty/nod/nod.hpp
vendored
4
3rdparty/nod/nod.hpp
vendored
@ -269,7 +269,11 @@ namespace nod {
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
/// Result type when calling the accumulating function operator.
|
/// 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;
|
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
|
/// Construct a signal_accumulator as a proxy to a given signal
|
||||||
//
|
//
|
||||||
|
Loading…
Reference in New Issue
Block a user