From 17680628c4ab103c85fbedceb5d7d0f00ce45f5c Mon Sep 17 00:00:00 2001 From: Christian Kern Date: Tue, 3 Mar 2015 08:56:11 +0100 Subject: [PATCH] Cannot reference catched excpetion in EMBB_THROW, this will not compile if exceptions are disabled... --- algorithms_cpp/include/embb/algorithms/merge_sort.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/algorithms_cpp/include/embb/algorithms/merge_sort.h b/algorithms_cpp/include/embb/algorithms/merge_sort.h index 432f767..5042eb9 100644 --- a/algorithms_cpp/include/embb/algorithms/merge_sort.h +++ b/algorithms_cpp/include/embb/algorithms/merge_sort.h @@ -174,12 +174,14 @@ void MergeSortAllocate( } value_type* temporary = static_cast( Alloc::Allocate(distance * sizeof(value_type))); + EMBB_TRY { MergeSort(first, last, temporary, comparison, policy, block_size); } EMBB_CATCH (embb::base::ErrorException & e) { // embb exception handling does not support catch(...) and rethrow yet. Alloc::Free(temporary); - EMBB_THROW(embb::base::ErrorException, e.what()); + EMBB_THROW(embb::base::ErrorException, \ + "Rethrown exception of type ErrorException"); } Alloc::Free(temporary); } -- libgit2 0.26.0