Merge pull request #3062 from STEllAR-GROUP/fixing_exceptions_seq

Fix exception handling for execution::seq
STEllAR-GROUP · Dec 31, 2017 · a5ac8fc · a5ac8fc
2 parents e2fb61c + 999a816
commit a5ac8fc
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/hpx/parallel/algorithms/detail/dispatch.hpp b/hpx/parallel/algorithms/detail/dispatch.hpp
@@ -124,7 +124,8 @@ namespace hpx { namespace parallel { inline namespace v1 { namespace detail
             }
             catch(...) {
                 // this does not return
-                return detail::handle_exception<ExPolicy, local_result_type>::call();
+                return detail::handle_exception<ExPolicy,
+                    local_result_type>::call();
             }
 #endif
         }
@@ -163,6 +164,9 @@ namespace hpx { namespace parallel { inline namespace v1 { namespace detail
                 return call_execute(std::forward<ExPolicy>(policy),
                     is_void(), std::forward<Args>(args)...);
             }
+            catch (std::bad_alloc const& ba) {
+                throw ba;
+            }
             catch (...) {
                 return detail::handle_exception<ExPolicy, local_result_type>::
                     call();
@@ -187,6 +191,9 @@ namespace hpx { namespace parallel { inline namespace v1 { namespace detail
                         ExPolicy, local_result_type
                     >::get(std::move(result));
             }
+            catch (std::bad_alloc const& ba) {
+                throw ba;
+            }
             catch (...) {
                 return detail::handle_exception<ExPolicy, local_result_type>::
                     call();