Merge 'master' into 'amd-master'

Change-Id: I89845b0c0d8a6196b291803106d891d2996dd363

include/hip/hcc_detail/helpers.hpp

@@ -89,7 +89,7 @@ template <typename, typename = void>
 struct is_callable_impl : std::false_type {};
 
 template <FunctionalProcedure F, typename... Ts>
-struct is_callable_impl<F(Ts...), void_t_<typename> std::result_of<F>::type(Ts...) > > : std::true_type {};
+struct is_callable_impl<F(Ts...), void_t_<typename std::result_of<F(Ts...)>::type > > : std::true_type {};
 #else
 
 // C++17