Commit 540893fc authored by Matthieu Dorier's avatar Matthieu Dorier

removing more C++14 things that Intel compiler doesn't understand

parent 37122f93
......@@ -90,7 +90,7 @@ private:
*/
template<typename F, bool disable_response>
static void rpc_handler_ult(hg_handle_t handle) {
using G = std::remove_reference_t<F>;
using G = typename std::remove_reference<F>::type;
const struct hg_info* info = margo_get_info(handle);
margo_instance_id mid = margo_hg_handle_get_instance(handle);
void* data = margo_registered_data(mid, info->id);
......@@ -384,7 +384,7 @@ remote_procedure engine::define(const std::string& name,
std::function<void(Args...)> l = [&fun, &r](Args&&... args) {
fun(r, std::forward<Args>(args)...);
};
std::tuple<std::decay_t<Args>...> iargs;
std::tuple<typename std::decay<Args>::type...> iargs;
if(sizeof...(Args) > 0) {
buffer_input_archive iarch(b, *this);
iarch & iargs;
......
......@@ -74,7 +74,9 @@ public:
*/
template<typename T1, typename T2, typename ... Tn>
auto as() const {
std::tuple<std::decay_t<T1>, std::decay_t<T2>, std::decay_t<Tn>...> t;
std::tuple<typename std::decay<T1>::type,
typename std::decay<T2>::type,
typename std::decay_t<Tn>::type...> t;
buffer_input_archive iarch(m_buffer);
iarch & t;
return t;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment