Skip to content

Commit 4f6a5b7

Browse files
committed
DataAlgo : Prefer std::invoke_result_t to std::result_of
The latter is deprecated in C++17, and due for removal in C++20.
1 parent 5325d99 commit 4f6a5b7

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

include/IECore/DataAlgo.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,9 @@ bool trait( const IECore::Data *data );
100100
/// };
101101
/// ```
102102
template<typename F, typename... Args>
103-
typename std::result_of<F( Data *, Args&&... )>::type dispatch( Data *data, F &&functor, Args&&... args );
103+
typename std::invoke_result_t<F, Data *, Args&&...> dispatch( Data *data, F &&functor, Args&&... args );
104104
template<typename F, typename... Args>
105-
typename std::result_of<F( const Data *, Args&&... )>::type dispatch( const Data *data, F &&functor, Args&&... args );
105+
typename std::invoke_result_t<F, const Data *, Args&&...> dispatch( const Data *data, F &&functor, Args&&... args );
106106

107107
} // namespace IECore
108108

include/IECore/DataAlgo.inl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ namespace IECore
4747
{
4848

4949
template<class F, typename... Args>
50-
typename std::result_of<F( Data *, Args&&... )>::type dispatch( Data *data, F &&functor, Args&&... args )
50+
typename std::invoke_result_t<F, Data *, Args&&...> dispatch( Data *data, F &&functor, Args&&... args )
5151
{
5252
IECore::TypeId typeId = data->typeId();
5353

@@ -199,7 +199,7 @@ typename std::result_of<F( Data *, Args&&... )>::type dispatch( Data *data, F &&
199199
}
200200

201201
template<class F, typename... Args>
202-
typename std::result_of<F( const Data *, Args&&... )>::type dispatch( const Data *data, F &&functor, Args&&... args )
202+
typename std::invoke_result_t<F, const Data *, Args&&...> dispatch( const Data *data, F &&functor, Args&&... args )
203203
{
204204
IECore::TypeId typeId = data->typeId();
205205

0 commit comments

Comments
 (0)