Mercurial > hg > truffle
changeset 3981:e807478bf9ca
7091366: re-enable quicksort tests
Summary: Added extern "C" to make it build with JDK6 compilers
Reviewed-by: jwilhelm, kvn
author | brutisso |
---|---|
date | Mon, 26 Sep 2011 10:14:30 +0200 |
parents | 8229bd737950 |
children | 273b46400613 |
files | src/share/vm/utilities/quickSort.cpp |
diffstat | 1 files changed, 11 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/utilities/quickSort.cpp Fri Sep 23 16:07:49 2011 -0400 +++ b/src/share/vm/utilities/quickSort.cpp Mon Sep 26 10:14:30 2011 +0200 @@ -54,16 +54,18 @@ return 1; } -static int test_stdlib_comparator(const void* a, const void* b) { - int ai = *(int*)a; - int bi = *(int*)b; - if (ai == bi) { - return 0; +extern "C" { + static int test_stdlib_comparator(const void* a, const void* b) { + int ai = *(int*)a; + int bi = *(int*)b; + if (ai == bi) { + return 0; + } + if (ai < bi) { + return -1; + } + return 1; } - if (ai < bi) { - return -1; - } - return 1; } void QuickSort::print_array(const char* prefix, int* array, int length) { @@ -92,7 +94,6 @@ } bool QuickSort::test_quick_sort() { -#if 0 tty->print_cr("test_quick_sort\n"); { int* test_array = NULL; @@ -213,7 +214,6 @@ delete[] test_array; delete[] expected_array; } -#endif return true; }