Changeset: 9d3870ce688d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9d3870ce688d
Modified Files:
gdk/gdk_calc.c
gdk/gdk_cand.h
Branch: default
Log Message:
Merge with Oct2014 branch.
diffs (34 lines):
diff --git a/gdk/gdk_calc.c b/gdk/gdk_calc.c
--- a/gdk/gdk_calc.c
+++ b/gdk/gdk_calc.c
@@ -2726,7 +2726,7 @@ static BAT *
BATcalcincrdecr(BAT *b, BAT *s, int abort_on_error,
BUN (*typeswitchloop)(const void *, int, int, const void *,
int, int, void *, int, BUN, BUN, BUN,
- const oid *, const oid *, oid, int,
+ const oid *restrict, const oid *, oid,
int,
const char *),
const char *func)
{
@@ -6168,7 +6168,7 @@ static BAT *
BATcalcmuldivmod(BAT *b1, BAT *b2, BAT *s, int tp, int abort_on_error,
BUN (*typeswitchloop)(const void *, int, int, const void *,
int, int, void *, int, BUN, BUN, BUN,
- const oid *, const oid *, oid, int,
+ const oid *restrict, const oid *, oid,
int,
const char *),
const char *func)
{
diff --git a/gdk/gdk_cand.h b/gdk/gdk_cand.h
--- a/gdk/gdk_cand.h
+++ b/gdk/gdk_cand.h
@@ -41,8 +41,8 @@
start = end = 0; \
} else { \
assert(cand < candend); \
+ end = cand[end-start-1] + 1; \
start = *cand; \
- end = cand[end-start-1] + 1; \
} \
} \
assert(start <= end); \
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
