diff options
Diffstat (limited to 'libstdc++-v3/include/parallel/multiway_merge.h')
| -rw-r--r-- | libstdc++-v3/include/parallel/multiway_merge.h | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/libstdc++-v3/include/parallel/multiway_merge.h b/libstdc++-v3/include/parallel/multiway_merge.h index a5fd3be1bd0..1c73ad0042d 100644 --- a/libstdc++-v3/include/parallel/multiway_merge.h +++ b/libstdc++-v3/include/parallel/multiway_merge.h @@ -1045,11 +1045,12 @@ namespace __gnu_parallel _ValueType; // __k sequences. - _SeqNumber __k = static_cast<_SeqNumber>(__seqs_end - __seqs_begin); + const _SeqNumber __k + = static_cast<_SeqNumber>(__seqs_end - __seqs_begin); - _ThreadIndex __num_threads = omp_get_num_threads(); + const _ThreadIndex __num_threads = omp_get_num_threads(); - _DifferenceType __num_samples = + const _DifferenceType __num_samples = __gnu_parallel::_Settings::get().merge_oversampling * __num_threads; _ValueType* __samples = static_cast<_ValueType*> @@ -1096,6 +1097,10 @@ namespace __gnu_parallel __pieces[__slab][__seq].second = _GLIBCXX_PARALLEL_LENGTH(__seqs_begin[__seq]); } + + for (_SeqNumber __s = 0; __s < __k; ++__s) + for (_DifferenceType __i = 0; __i < __num_samples; ++__i) + __samples[__s * __num_samples + __i].~_ValueType(); ::operator delete(__samples); } @@ -1258,10 +1263,10 @@ namespace __gnu_parallel __length = std::min<_DifferenceTp>(__length, __total_length); if (__total_length == 0 || __k == 0) - { - delete[] __ne_seqs; - return __target; - } + { + delete[] __ne_seqs; + return __target; + } std::vector<std::pair<_DifferenceType, _DifferenceType> >* __pieces; |
