std::result_of<> is sometimes more convenient than decltype()

rollbear · rollbear · commit b8d38f85360c · 2015-01-10T16:45:30.000+01:00
diff --git a/trompeloeil.hpp b/trompeloeil.hpp
@@ -915,7 +915,7 @@ namespace trompeloeil
     call_modifier<Matcher, return_injector<return_of_t<signature>, Parent > >
     handle_return(H&& h)
     {
-      using ret = decltype(h(std::declval<call_params_type_t<signature>& >()));
+      using ret = typename std::result_of<H(call_params_type_t<signature>&)>::type;
       static_assert(std::is_constructible<return_of_t<signature>, ret>::value
                     || !std::is_same<return_of_t<signature>, void>::value,
                     "RETURN does not make sense for void-function");

Original file line number	Diff line number	Diff line change
`@@ -915,7 +915,7 @@ namespace trompeloeil`
`915`	`915`	`call_modifier<Matcher, return_injector<return_of_t<signature>, Parent > >`
`916`	`916`	`handle_return(H&& h)`
`917`	`917`	`{`
`918`		`- using ret = decltype(h(std::declval<call_params_type_t<signature>& >()));`
	`918`	`+ using ret = typename std::result_of<H(call_params_type_t<signature>&)>::type;`
`919`	`919`	`static_assert(std::is_constructible<return_of_t<signature>, ret>::value`
`920`	`920`	`\|\| !std::is_same<return_of_t<signature>, void>::value,`
`921`	`921`	`"RETURN does not make sense for void-function");`