Commit 6d3c6d03 by Christian Kern

Merge branch 'embb418-exception-disabled-bug' into development

parents 72cbb0cd bc14a77d
...@@ -174,12 +174,18 @@ void MergeSortAllocate( ...@@ -174,12 +174,18 @@ void MergeSortAllocate(
} }
value_type* temporary = static_cast<value_type*>( value_type* temporary = static_cast<value_type*>(
Alloc::Allocate(distance * sizeof(value_type))); Alloc::Allocate(distance * sizeof(value_type)));
EMBB_TRY { EMBB_TRY {
MergeSort(first, last, temporary, comparison, policy, block_size); MergeSort(first, last, temporary, comparison, policy, block_size);
} EMBB_CATCH (embb::base::ErrorException & e) { } EMBB_CATCH (embb::base::ErrorException & e) {
// embb exception handling does not support catch(...) and rethrow yet. // embb exception handling does not support catch(...) and rethrow yet.
Alloc::Free(temporary); Alloc::Free(temporary);
// Rethrow only, if exceptions are enabled... Otherwise, the parameter
// e cannot be used, as it is not defined.
#ifdef EMBB_USE_EXCEPTIONS
EMBB_THROW(embb::base::ErrorException, e.what()); EMBB_THROW(embb::base::ErrorException, e.what());
#endif
} }
Alloc::Free(temporary); Alloc::Free(temporary);
} }
......
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 sign in to comment