Changeset: ad7540ad5bbd for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/ad7540ad5bbd
Modified Files:
gdk/gdk_calc_private.h
testing/Mtest.py.in
Branch: default
Log Message:
Merge with Jan2022 branch.
diffs (60 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -762,3 +762,4 @@ cab90a348501b045e19cee5cebcc44f3800bd0a8
cab90a348501b045e19cee5cebcc44f3800bd0a8 Jul2021_SP5_release
5872f047d97c98d3a848514438b8f97fa446855d Jan2022_11
025239a5a6f122042798c0f1132a2c6298514e06 Jan2022_13
+025239a5a6f122042798c0f1132a2c6298514e06 Jan2022_SP2_release
diff --git a/gdk/gdk_calc_private.h b/gdk/gdk_calc_private.h
--- a/gdk/gdk_calc_private.h
+++ b/gdk/gdk_calc_private.h
@@ -155,22 +155,22 @@
#define LNGMUL_CHECK(lft, rgt, dst, max, on_overflow) \
MULI4_WITH_CHECK(lft, rgt, lng, dst, max, hge, on_overflow)
#else
-#if defined(HAVE__MUL128)
+#if defined(_MSC_VER)
#include <intrin.h>
#pragma intrinsic(_mul128)
-#define LNGMUL_CHECK(lft, rgt, dst, max, on_overflow) \
- do { \
- lng clo, chi; \
- clo = _mul128((lng) (lft), (lng) (rgt), &chi); \
- if ((chi == 0 && clo >= 0 && clo <= (max)) || \
- (chi == -1 && clo < 0 && clo >= -(max))) { \
- (dst) = clo; \
- } else { \
- if (abort_on_error) \
- on_overflow; \
- (dst) = lng_nil; \
- nils++; \
- } \
+#define LNGMUL_CHECK(lft, rgt, dst, max, on_overflow) \
+ do { \
+ __int64 clo, chi; \
+ clo = _mul128((__int64) (lft), (__int64) (rgt), &chi); \
+ if ((chi == 0 && clo >= 0 && clo <= (max)) || \
+ (chi == -1 && clo < 0 && clo >= -(max))) { \
+ (dst) = (lng) clo; \
+ } else { \
+ if (abort_on_error) \
+ on_overflow; \
+ (dst) = lng_nil; \
+ nils++; \
+ } \
} while (0)
#else
#define LNGMUL_CHECK(lft, rgt, dst, max, on_overflow) \
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -304,6 +304,8 @@ def remove(file):
os.remove(file)
except FileNotFoundError:
pass
+ except IsADirectoryError:
+ shutil.rmtree(file)
except:
Warn('could not remove {}'.format(file))
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
