Add workarounds for bugs in Intel C++ compiler

Amanieu · Feb 13, 2015 · 4613fa0 · 4613fa0
1 parent 0860499
commit 4613fa0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/include/async++/scheduler_fwd.h b/include/async++/scheduler_fwd.h
@@ -164,4 +164,10 @@ class threadpool_scheduler {
 	LIBASYNC_EXPORT void schedule(task_run_handle t);
 };
 
+namespace detail {
+
+// Work-around for Intel compiler handling decltype poorly in function returns
+typedef std::remove_reference<decltype(::async::default_scheduler())>::type default_scheduler_type;
+
+} // namespace detail
 } // namespace async
diff --git a/include/async++/task.h b/include/async++/task.h
@@ -402,7 +402,7 @@ class local_task {
 	template<typename S, typename F>
 	friend local_task<S, F> local_spawn(S& sched, F&& f);
 	template<typename F>
-	friend local_task<typename std::remove_reference<decltype(::async::default_scheduler())>::type, F> local_spawn(F&& f);
+	friend local_task<detail::default_scheduler_type, F> local_spawn(F&& f);
 
 	// Constructor, used by local_spawn
 	local_task(Sched& sched, Func&& f)
@@ -466,8 +466,11 @@ class local_task {
 
 // Spawn a function asynchronously
 template<typename Sched, typename Func>
-task<typename detail::remove_task<decltype(std::declval<typename std::decay<Func>::type>()())>::type> spawn(Sched& sched, Func&& f)
+task<typename detail::remove_task<typename std::result_of<typename std::decay<Func>::type()>::type>::type> spawn(Sched& sched, Func&& f)
 {
+	// Using result_of in the function return type to work around bugs in the Intel
+	// C++ compiler.
+
 	// Make sure the function type is callable
 	typedef typename std::decay<Func>::type decay_func;
 	static_assert(detail::is_callable<decay_func()>::value, "Invalid function type passed to spawn()");
@@ -530,7 +533,7 @@ template<typename Func>
 #ifdef __GNUC__
 __attribute__((warn_unused_result))
 #endif
-local_task<typename std::remove_reference<decltype(::async::default_scheduler())>::type, Func> local_spawn(Func&& f)
+local_task<detail::default_scheduler_type, Func> local_spawn(Func&& f)
 {
 	return {::async::default_scheduler(), std::forward<Func>(f)};
 }