Skip to content

Commit 18558ab

Browse files
Merge pull request #95 from PansonPanson/master
java/12_sorts/MergeSort
2 parents d6aa5b8 + 373b935 commit 18558ab

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

java/12_sorts/MergeSort.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ private static void mergeSortInternally(int[] a, int p, int r) {
1515
// 递归终止条件
1616
if (p >= r) return;
1717

18-
// 取p到r之间的中间位置q
19-
int q = (p+r)/2;
18+
// 取p到r之间的中间位置q,防止(p+r)的和超过int类型最大值
19+
int q = p + (r - p)/2;
2020
// 分治递归
2121
mergeSortInternally(a, p, q);
2222
mergeSortInternally(a, q+1, r);

0 commit comments

Comments
 (0)