From ff51a4201e12d47a121623b355b53186ff5c2eaa Mon Sep 17 00:00:00 2001
From: brutisso <unknown>
Date: Mon, 26 Sep 2011 10:14:30 +0200
Subject: [PATCH] 7091366: re-enable quicksort tests Summary: Added extern "C"
 to make it build with JDK6 compilers Reviewed-by: jwilhelm, kvn

---
 src/share/vm/utilities/quickSort.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/share/vm/utilities/quickSort.cpp b/src/share/vm/utilities/quickSort.cpp
index b377d9a3c..947b420e7 100644
--- a/src/share/vm/utilities/quickSort.cpp
+++ b/src/share/vm/utilities/quickSort.cpp
@@ -54,16 +54,18 @@ static int test_even_odd_comparator(int a, int b) {
   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;
-  }
-  if (ai < bi) {
-    return -1;
+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;
   }
-  return 1;
 }
 
 void QuickSort::print_array(const char* prefix, int* array, int length) {
@@ -92,7 +94,6 @@ bool QuickSort::sort_and_compare(int* arrayToSort, int* expectedResult, int leng
 }
 
 bool QuickSort::test_quick_sort() {
-#if 0
   tty->print_cr("test_quick_sort\n");
   {
     int* test_array = NULL;
@@ -213,7 +214,6 @@ bool QuickSort::test_quick_sort() {
     delete[] test_array;
     delete[] expected_array;
   }
-#endif
   return true;
 }
 
-- 
GitLab