MonetDB: default - Merge with Feb2013 branch.

[Stefan Manegold]

Changeset: 344e83d58b63 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=344e83d58b63
Modified Files:
        monetdb5/modules/mal/pqueue.c
Branch: default
Log Message:

Merge with Feb2013 branch.


diffs (40 lines):

diff --git a/monetdb5/modules/mal/pqueue.c b/monetdb5/modules/mal/pqueue.c
--- a/monetdb5/modules/mal/pqueue.c
+++ b/monetdb5/modules/mal/pqueue.c
@@ -1067,10 +1067,10 @@ PQinit(int *ret, int *bid, wrd *maxsize)
 }
 
 static void
-PQtopn_sorted_min( BAT **bn, BAT *b, wrd _N )
+PQtopn_sorted_min( BAT **bn, BAT *b, wrd NN )
 {
-       BUN cnt = BATcount(b), N = (BUN) _N;
-       assert(_N >= 0);
+       BUN cnt = BATcount(b), N = (BUN) NN;
+       assert(NN >= 0);
        if (b->tsorted) {
                b = BATslice(b, N>=cnt?0:cnt-N, cnt);
                *bn = BATsort_rev(b);
@@ -1080,10 +1080,10 @@ PQtopn_sorted_min( BAT **bn, BAT *b, wrd
 }
 
 static void
-PQtopn_sorted_max( BAT **bn, BAT *b, wrd _N )
+PQtopn_sorted_max( BAT **bn, BAT *b, wrd NN )
 {
-       BUN cnt = BATcount(b), N = (BUN) _N;
-       assert(_N >= 0);
+       BUN cnt = BATcount(b), N = (BUN) NN;
+       assert(NN >= 0);
        if (b->tsorted) 
                *bn = BATslice(b, 0, N>=cnt?cnt:N);
        else {
@@ -1300,7 +1300,7 @@ PQtopn_sorted_max( BAT **bn, BAT *b, wrd
 
 
 PQminmax(bte)
-       PQminmax(sht)
+PQminmax(sht)
 PQminmax(int)
 PQminmax(oid)
 PQminmax(wrd)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list