From 8b3a6634dbe049ebe07aec089de54dc30242278e Mon Sep 17 00:00:00 2001 From: Krishna Vedala <7001608+kvedala@users.noreply.github.com> Date: Thu, 27 Aug 2020 16:46:37 -0400 Subject: [PATCH] replace c-style array with std::array --- sorting/merge_insertion_sort.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sorting/merge_insertion_sort.cpp b/sorting/merge_insertion_sort.cpp index 8ccfd5bd6..07b2ed19d 100644 --- a/sorting/merge_insertion_sort.cpp +++ b/sorting/merge_insertion_sort.cpp @@ -35,7 +35,7 @@ namespace merge_insertion { */ template static void InsertionSort(std::array *A, size_t start, size_t end) { - size_t i, j; + size_t i = 0, j = 0; T *ptr = A->data(); for (i = start; i < end; i++) { @@ -69,7 +69,7 @@ static void merge(std::array *array, size_t min, size_t max, size_t mid) { size_t secondIndex = mid + 1; auto ptr = array->data(); - auto tempArray = std::unique_ptr(new T[max + 1]); + std::array tempArray{0}; // While there are elements in the left or right runs for (size_t index = min; index <= max; index++) { @@ -78,16 +78,14 @@ static void merge(std::array *array, size_t min, size_t max, size_t mid) { (secondIndex > max || ptr[firstIndex] <= ptr[secondIndex])) { tempArray[index] = ptr[firstIndex]; firstIndex++; - } - - else { + } else { tempArray[index] = ptr[secondIndex]; secondIndex++; } } // transfer to the initial array - memcpy(ptr + min, tempArray.get() + min, (max - min) * sizeof(T)); + memcpy(ptr + min, tempArray.data() + min, (max - min) * sizeof(T)); // for (int index = min; index <= max; index++) ptr[index] = // tempArray[index]; }