From 540893fc974dae3a6de2a1a26181744a2c16f0ec Mon Sep 17 00:00:00 2001
From: Matthieu Dorier <mdorier@anl.gov>
Date: Wed, 26 Sep 2018 20:51:49 +0200
Subject: [PATCH] removing more C++14 things that Intel compiler doesn't
 understand

---
 include/thallium/engine.hpp          | 4 ++--
 include/thallium/packed_response.hpp | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/include/thallium/engine.hpp b/include/thallium/engine.hpp
index 49cc199..8ba7e85 100644
--- a/include/thallium/engine.hpp
+++ b/include/thallium/engine.hpp
@@ -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;
diff --git a/include/thallium/packed_response.hpp b/include/thallium/packed_response.hpp
index 6b7b3e1..c880568 100644
--- a/include/thallium/packed_response.hpp
+++ b/include/thallium/packed_response.hpp
@@ -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;
-- 
2.26.2