Changeset: 6b6db8ff746e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6b6db8ff746e
Modified Files:
gdk/gdk_calc.c
Branch: default
Log Message:
Merge with Jan2014 branch.
diffs (21 lines):
diff --git a/gdk/gdk_calc.c b/gdk/gdk_calc.c
--- a/gdk/gdk_calc.c
+++ b/gdk/gdk_calc.c
@@ -8492,13 +8492,12 @@ BATcalcbetween(BAT *b, BAT *lo, BAT *hi,
bit res;
if (b->T->seq == oid_nil ||
- (lo->T->seq == oid_nil && hi->T->seq == oid_nil))
+ lo->T->seq == oid_nil ||
+ hi->T->seq == oid_nil)
res = bit_nil;
else
- res = (bit) ((lo->T->seq == oid_nil ||
- b->T->seq >= lo->T->seq) &&
- (hi->T->seq == oid_nil ||
- b->T->seq <= hi->T->seq));
+ res = (bit) (b->T->seq >= lo->T->seq &&
+ b->T->seq <= hi->T->seq);
return BATconst(b, TYPE_bit, &res, TRANSIENT);
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
