F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

core: Use std::invoke_result instead of std::result_of

Browse Source 
C++17 introduces `std::invoke_result`, and deprecates
the usage of `std::result_of`.

Signed-off-by: Ameya Deshpande <ameyanrd@outlook.com>
This commit is contained in:
Ameya Deshpande
2021-11-22 17:29:07 +05:30
committed by Tom Henderson
parent 0001916d89
commit fcc095b05c
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/model/attribute-container.h
View File

@@ -68,7 +68,7 @@ public:
// use underlying AttributeValue to get return element type
/** Item type of container returned by Get. */
typedef typename std::result_of<decltype(&A::Get)(A)>::type item_type;
typedef typename std::invoke_result_t<decltype(&A::Get), A> item_type;
/** Type of container returned. */
typedef C<item_type> result_type;

4
src/core/model/pair.h
View File

@@ -58,9 +58,9 @@ public:
/** Type of value stored in the PairValue. */
typedef std::pair<Ptr<A>, Ptr<B> > value_type;
/** Type of abscissa (first entry of pair). */
typedef typename std::result_of<decltype(&A::Get)(A)>::type first_type;
typedef typename std::invoke_result_t<decltype(&A::Get), A> first_type;
/** Type of ordinal (second entry of pair). */
typedef typename std::result_of<decltype(&B::Get)(B)>::type second_type;
typedef typename std::invoke_result_t<decltype(&B::Get), B> second_type;
/** Type returned by Get or passed in Set. */
typedef typename std::pair<first_type, second_type> result_type;