Changeset 23508 for main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/QueryResultsSort.h

Timestamp:

2010-12-17T14:04:10+13:00 (13 years ago)

Author:

sjm84

Message:

Committing 64 bit changes into the branch

File:

• main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/QueryResultsSort.h (modified) (6 diffs)

main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mgpp/text/QueryResultsSort.h

@@ -45 +45 @@
 void PushHeap (DocNumArray::iterator docNumHeap,
            RandomAccessIterator parallelHeap,
-           unsigned long heapSize,
+           mg_u_long heapSize,
            const Compare &comp) {
-  unsigned long holeIndex = heapSize-1;
-  unsigned long parent = (holeIndex - 1) / 2;
+  mg_u_long holeIndex = heapSize-1;
+  mg_u_long parent = (holeIndex - 1) / 2;
   while (holeIndex > 0 && comp (*(parallelHeap+parent),
                 *(parallelHeap+holeIndex))) {
@@ -63 +63 @@
 void AdjustHeap (DocNumArray::iterator docNumHeap,
              RandomAccessIterator parallelHeap,
-             unsigned long holeIndex,
-             unsigned long heapSize,
+             mg_u_long holeIndex,
+             mg_u_long heapSize,
              const Compare &comp) {
-  unsigned long secondChild = 2 * holeIndex + 2;
+  mg_u_long secondChild = 2 * holeIndex + 2;
   while (secondChild < heapSize) {
     if (comp(*(parallelHeap + secondChild),
@@ -87 +87 @@
 void PopHeap (DocNumArray::iterator docNumHeap,
           RandomAccessIterator parallelHeap,
-          unsigned long heapSize,
+          mg_u_long heapSize,
           const Compare &comp) {
   swap (*(parallelHeap), *(parallelHeap+heapSize-1));
   swap (*(docNumHeap), *(docNumHeap+heapSize-1));
-  AdjustHeap (docNumHeap, parallelHeap, (unsigned long)0, heapSize-1, comp);
+  AdjustHeap (docNumHeap, parallelHeap, (mg_u_long)0, heapSize-1, comp);
 }
 
@@ -97 +97 @@
 void MakeHeap (DocNumArray::iterator docNumHeap,
            RandomAccessIterator parallelHeap,
-           unsigned long size,
+           mg_u_long size,
            const Compare &comp) {
   if (size < 2) return;
   
-  unsigned long i = 0;
+  mg_u_long i = 0;
   for (i=1; i<=size; ++i)
     PushHeap (docNumHeap, parallelHeap, i, comp);
@@ -110 +110 @@
 void SortHeap (DocNumArray::iterator docNumHeap,
            RandomAccessIterator parallelHeap,
-           unsigned long size,
+           mg_u_long size,
            const Compare &comp) {
   if (size < 2) return;
 
-  unsigned long i;
+  mg_u_long i;
   for (i=size; i>1; --i)
     PopHeap (docNumHeap, parallelHeap, i, comp);
@@ -123 +123 @@
 void SelectAddHeap (DocNumArray::iterator docNumHeap,
             RandomAccessIterator parallelHeap,
-            unsigned long heapSize,
+            mg_u_long heapSize,
             DocNumArray::iterator docNumAdd,
             RandomAccessIterator parallelAdd,
-            unsigned long addSize,
+            mg_u_long addSize,
             const Compare &comp) {
-  unsigned long i;
+  mg_u_long i;
   for (i=0; i<addSize; ++i) {
     if (comp(*(parallelAdd+i), *(parallelHeap))) {
       swap (*(docNumHeap), *(docNumAdd+i));
       swap (*(parallelHeap), *(parallelAdd+i));
-      AdjustHeap (docNumHeap, parallelHeap, (unsigned long)0, heapSize, comp);
+      AdjustHeap (docNumHeap, parallelHeap, (mg_u_long)0, heapSize, comp);
     }
   }