Changeset: 3aff78a5f725 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3aff78a5f725
Modified Files:
gdk/gdk_analytic_bounds.c
gdk/gdk_analytic_func.c
Branch: analytics
Log Message:
make it compile again
diffs (82 lines):
diff --git a/gdk/gdk_analytic_bounds.c b/gdk/gdk_analytic_bounds.c
--- a/gdk/gdk_analytic_bounds.c
+++ b/gdk/gdk_analytic_bounds.c
@@ -17,8 +17,8 @@
j = k; \
for(; k<i; k++, rb++) { \
lng rlimit = (lng) LIMIT; \
- SUB_WITH_CHECK(lng, k, lng, rlimit, lng, calc1,
GDK_lng_max, goto calc_overflow); \
- ADD_WITH_CHECK(lng, calc1, lng, !first_half, lng,
calc2, GDK_lng_max, goto calc_overflow); \
+ SUB_WITH_CHECK(k, rlimit, lng, calc1, GDK_lng_max, goto
calc_overflow); \
+ ADD_WITH_CHECK(calc1, !first_half, lng, calc2,
GDK_lng_max, goto calc_overflow); \
*rb = MAX(calc2, j); \
} \
} while(0)
@@ -28,8 +28,8 @@
lng calc1, calc2; \
for(; k<i; k++, rb++) { \
lng rlimit = (lng) LIMIT; \
- ADD_WITH_CHECK(lng, rlimit, lng, k, lng, calc1,
GDK_lng_max, goto calc_overflow); \
- ADD_WITH_CHECK(lng, calc1, lng, !first_half, lng,
calc2, GDK_lng_max, goto calc_overflow); \
+ ADD_WITH_CHECK(rlimit, k, lng, calc1, GDK_lng_max, goto
calc_overflow); \
+ ADD_WITH_CHECK(calc1, !first_half, lng, calc2,
GDK_lng_max, goto calc_overflow); \
*rb = MIN(calc2, i); \
} \
} while(0)
@@ -55,7 +55,7 @@
break; \
if(is_##TPE1##_nil(bp[j])) \
break; \
- SUB_WITH_CHECK(TPE1, v, TPE1, bp[j],
TPE1, calc, GDK_##TPE1##_max, goto calc_overflow); \
+ SUB_WITH_CHECK(v, bp[j], TPE1, calc,
GDK_##TPE1##_max, goto calc_overflow); \
if ((TPE2)(ABSOLUTE(calc)) > rlimit) \
break; \
} \
@@ -81,7 +81,7 @@
for(j=k+1; j<i; j++) { \
if(is_##TPE1##_nil(bp[j])) \
break; \
- SUB_WITH_CHECK(TPE1, v, TPE1, bp[j],
TPE1, calc, GDK_##TPE1##_max, goto calc_overflow); \
+ SUB_WITH_CHECK(v, bp[j], TPE1, calc,
GDK_##TPE1##_max, goto calc_overflow); \
if ((TPE2)(ABSOLUTE(calc)) > rlimit) \
break; \
} \
diff --git a/gdk/gdk_analytic_func.c b/gdk/gdk_analytic_func.c
--- a/gdk/gdk_analytic_func.c
+++ b/gdk/gdk_analytic_func.c
@@ -1097,7 +1097,7 @@ GDKanalyticalcount(BAT *r, BAT *b, BAT *
if(is_##TPE2##_nil(curval)) \
curval = (TPE2) v; \
else \
- ADD_WITH_CHECK(TPE1, v, TPE2,
curval, TPE2, curval, GDK_##TPE2##_max, goto calc_overflow); \
+ ADD_WITH_CHECK(v, curval, TPE2,
curval, GDK_##TPE2##_max, goto calc_overflow); \
} \
} \
*rb = curval; \
@@ -1287,7 +1287,7 @@ calc_overflow:
if(is_##TPE2##_nil(curval)) \
curval = (TPE2) v; \
else \
- MUL4_WITH_CHECK(TPE1, v, TPE2,
curval, TPE2, curval, GDK_##TPE2##_max, TPE3, \
+ MUL4_WITH_CHECK(v, curval,
TPE2, curval, GDK_##TPE2##_max, TPE3, \
goto calc_overflow); \
} \
} \
@@ -1313,7 +1313,7 @@ calc_overflow:
if(is_##TPE2##_nil(curval)) \
curval = (TPE2) v; \
else \
- REAL_IMP(TPE1, v, TPE2, curval,
curval, GDK_##TPE2##_max, goto calc_overflow); \
+ REAL_IMP(v, curval, curval,
GDK_##TPE2##_max, goto calc_overflow); \
} \
} \
*rb = curval; \
@@ -1517,7 +1517,7 @@ calc_overflow:
for(; bs<be; bs++) { \
v = *bs; \
if (!is_##TPE##_nil(v)) { \
- ADD_WITH_CHECK(TPE, v, lng_hge, sum,
lng_hge, sum, GDK_##lng_hge##_max, goto avg_overflow##TPE); \
+ ADD_WITH_CHECK(v, sum, lng_hge, sum,
GDK_##lng_hge##_max, goto avg_overflow##TPE); \
/* count only when no overflow occurs
*/ \
n++; \
} \
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
