From: Johannes Singler Date: Thu, 10 Jul 2008 08:19:26 +0000 (+0000) Subject: balanced_quicksort.h: (qsb_divide) Replace "*end" by "*(end - 1)" in assertion. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=38a28aabc1c885725b749248165889e8f1e5180d;p=gcc.git balanced_quicksort.h: (qsb_divide) Replace "*end" by "*(end - 1)" in assertion. 2008-07-10 Johannes Singler * include/parallel/balanced_quicksort.h: (qsb_divide) Replace "*end" by "*(end - 1)" in assertion. From-SVN: r137691 --- diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 1dc6b9848aa..7eb7732d828 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2008-07-10 Johannes Singler + + * include/parallel/balanced_quicksort.h: + (qsb_divide) Replace "*end" by "*(end - 1)" in assertion. + 2008-07-09 Benjamin Kosnik PR libstdc++/36451 diff --git a/libstdc++-v3/include/parallel/balanced_quicksort.h b/libstdc++-v3/include/parallel/balanced_quicksort.h index d94cf332a73..3393655fc98 100644 --- a/libstdc++-v3/include/parallel/balanced_quicksort.h +++ b/libstdc++-v3/include/parallel/balanced_quicksort.h @@ -122,11 +122,11 @@ template _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.