diff options
| author | Johannes Singler <singler@ira.uka.de> | 2008-07-10 08:19:26 +0000 |
|---|---|---|
| committer | Johannes Singler <singler@gcc.gnu.org> | 2008-07-10 08:19:26 +0000 |
| commit | 38a28aabc1c885725b749248165889e8f1e5180d (patch) | |
| tree | 3e50db5e9cd7b7a1746910970611bd6994fb7fa6 /libstdc++-v3 | |
| parent | a182fb6bfe35332c0890dfe6f89e433123f12f04 (diff) | |
| download | gcc-38a28aabc1c885725b749248165889e8f1e5180d.zip gcc-38a28aabc1c885725b749248165889e8f1e5180d.tar.gz gcc-38a28aabc1c885725b749248165889e8f1e5180d.tar.bz2 | |
balanced_quicksort.h: (qsb_divide) Replace "*end" by "*(end - 1)" in assertion.
2008-07-10 Johannes Singler <singler@ira.uka.de>
* include/parallel/balanced_quicksort.h:
(qsb_divide) Replace "*end" by "*(end - 1)" in assertion.
From-SVN: r137691
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/parallel/balanced_quicksort.h | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 1dc6b98..7eb7732 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2008-07-10 Johannes Singler <singler@ira.uka.de> + + * include/parallel/balanced_quicksort.h: + (qsb_divide) Replace "*end" by "*(end - 1)" in assertion. + 2008-07-09 Benjamin Kosnik <bkoz@redhat.com> PR libstdc++/36451 diff --git a/libstdc++-v3/include/parallel/balanced_quicksort.h b/libstdc++-v3/include/parallel/balanced_quicksort.h index d94cf33..3393655 100644 --- a/libstdc++-v3/include/parallel/balanced_quicksort.h +++ b/libstdc++-v3/include/parallel/balanced_quicksort.h @@ -122,11 +122,11 @@ template<typename RandomAccessIterator, typename Comparator> _GLIBCXX_PARALLEL_ASSERT( (!comp(*pivot_pos, *begin) && !comp(*(begin + n / 2), *pivot_pos)) - || (!comp(*pivot_pos, *begin) && !comp(*end, *pivot_pos)) + || (!comp(*pivot_pos, *begin) && !comp(*(end - 1), *pivot_pos)) || (!comp(*pivot_pos, *(begin + n / 2)) && !comp(*begin, *pivot_pos)) - || (!comp(*pivot_pos, *(begin + n / 2)) && !comp(*end, *pivot_pos)) - || (!comp(*pivot_pos, *end) && !comp(*begin, *pivot_pos)) - || (!comp(*pivot_pos, *end) && !comp(*(begin + n / 2), *pivot_pos))); + || (!comp(*pivot_pos, *(begin + n / 2)) && !comp(*(end - 1), *pivot_pos)) + || (!comp(*pivot_pos, *(end - 1)) && !comp(*begin, *pivot_pos)) + || (!comp(*pivot_pos, *(end - 1)) && !comp(*(begin + n / 2), *pivot_pos))); #endif // Swap pivot value to end. |