Changeset: fac3373795dc for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/fac3373795dc
Modified Files:
monetdb5/modules/mal/calc.c
Branch: new-avg
Log Message:
split hge and not hge def's into right parts, fixing compilation on no-int128
systems
diffs (28 lines):
diff --git a/monetdb5/modules/mal/calc.c b/monetdb5/modules/mal/calc.c
--- a/monetdb5/modules/mal/calc.c
+++ b/monetdb5/modules/mal/calc.c
@@ -1117,13 +1117,7 @@ mel_func calc_init_funcs[] = {
pattern("calc", "*", CMDvarMUL, false, "Return V1 * V2, signal error on
overflow", args(1,3, arg("",hge),arg("v1",dbl),arg("v2",int))),
pattern("calc", "*", CMDvarMUL, false, "Return V1 * V2, signal error on
overflow", args(1,3, arg("",hge),arg("v1",dbl),arg("v2",lng))),
pattern("calc", "*", CMDvarMUL, false, "Return V1 * V2, signal error on
overflow", args(1,3, arg("",hge),arg("v1",dbl),arg("v2",hge))),
-#ifdef HAVE_HGE
pattern("calc", "num_div", CMDvarDIV2, false, "Return (V1+(V2-1)/2) / V2, nil
on divide by zero", args(1,3, arg("",hge),arg("v1",hge),arg("v2",lng))),
-#endif
- pattern("calc", "num_div", CMDvarDIV2, false, "Return (V1+(V2-1)/2) / V2, nil
on divide by zero", args(1,3, arg("",lng),arg("v1",lng),arg("v2",lng))),
- pattern("calc", "num_div", CMDvarDIV2, false, "Return (V1+(V2-1)/2) / V2, nil
on divide by zero", args(1,3, arg("",int),arg("v1",int),arg("v2",lng))),
- pattern("calc", "num_div", CMDvarDIV2, false, "Return (V1+(V2-1)/2) / V2, nil
on divide by zero", args(1,3, arg("",sht),arg("v1",sht),arg("v2",lng))),
- pattern("calc", "num_div", CMDvarDIV2, false, "Return (V1+(V2-1)/2) / V2, nil
on divide by zero", args(1,3, arg("",bte),arg("v1",bte),arg("v2",lng))),
pattern("calc", "/", CMDvarDIV, false, "Return V1 / V2, signal error on
divide by zero", args(1,3, arg("",hge),arg("v1",bte),arg("v2",bte))),
pattern("calc", "/", CMDvarDIV, false, "Return V1 / V2, signal error on
divide by zero", args(1,3, arg("",hge),arg("v1",bte),arg("v2",sht))),
pattern("calc", "/", CMDvarDIV, false, "Return V1 / V2, signal error on
divide by zero", args(1,3, arg("",hge),arg("v1",bte),arg("v2",int))),
@@ -2042,6 +2036,10 @@ mel_func calc_init_funcs[] = {
pattern("calc", "/", CMDvarDIV, false, "Return V1 / V2, signal error on
divide by zero", args(1,3, arg("",sht),arg("v1",dbl),arg("v2",sht))),
pattern("calc", "/", CMDvarDIV, false, "Return V1 / V2, signal error on
divide by zero", args(1,3, arg("",int),arg("v1",dbl),arg("v2",int))),
pattern("calc", "/", CMDvarDIV, false, "Return V1 / V2, signal error on
divide by zero", args(1,3, arg("",lng),arg("v1",dbl),arg("v2",lng))),
+ pattern("calc", "num_div", CMDvarDIV2, false, "Return (V1+(V2-1)/2) / V2, nil
on divide by zero", args(1,3, arg("",lng),arg("v1",lng),arg("v2",lng))),
+ pattern("calc", "num_div", CMDvarDIV2, false, "Return (V1+(V2-1)/2) / V2, nil
on divide by zero", args(1,3, arg("",int),arg("v1",int),arg("v2",lng))),
+ pattern("calc", "num_div", CMDvarDIV2, false, "Return (V1+(V2-1)/2) / V2, nil
on divide by zero", args(1,3, arg("",sht),arg("v1",sht),arg("v2",lng))),
+ pattern("calc", "num_div", CMDvarDIV2, false, "Return (V1+(V2-1)/2) / V2, nil
on divide by zero", args(1,3, arg("",bte),arg("v1",bte),arg("v2",lng))),
pattern("calc", "%", CMDvarMOD, false, "Return V1 % V2, signal error on
divide by zero", args(1,3, arg("",lng),arg("v1",bte),arg("v2",bte))),
pattern("calc", "%", CMDvarMOD, false, "Return V1 % V2, signal error on
divide by zero", args(1,3, arg("",int),arg("v1",bte),arg("v2",bte))),
pattern("calc", "%", CMDvarMOD, false, "Return V1 % V2, signal error on
divide by zero", args(1,3, arg("",sht),arg("v1",bte),arg("v2",bte))),
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
