Changeset: ad07d9ec478d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ad07d9ec478d
Modified Files:
monetdb5/modules/mal/pqueue.c
Branch: Feb2013
Log Message:
"_N" appears to be pre-defined on OpenIndiana; using "NN" instead
diffs (31 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
@@ -1066,10 +1066,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);
@@ -1079,10 +1079,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 {
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
