MonetDB: Jan2022 - Merge with Jul2021 branch.

[Sjoerd Mullender]

Changeset: 8a1bc43ddb9b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/8a1bc43ddb9b
Modified Files:
        .hgtags
        cmake/monetdb-defines.cmake
        gdk/gdk_utils.h
        monetdb_config.h.in
Branch: Jan2022
Log Message:

Merge with Jul2021 branch.


diffs (39 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -766,3 +766,4 @@ 025239a5a6f122042798c0f1132a2c6298514e06
 2e54857a91306cc6304825c5596f65d00595db6b Jul2021_23
 2e54857a91306cc6304825c5596f65d00595db6b Jul2021_SP6_release
 1252291e5c0ddc91ccb16d612d04e34e6a7d3bc3 Jun2020_13
+1252291e5c0ddc91ccb16d612d04e34e6a7d3bc3 Jun2020_SP2_release
diff --git a/gdk/gdk_utils.h b/gdk/gdk_utils.h
--- a/gdk/gdk_utils.h
+++ b/gdk/gdk_utils.h
@@ -167,9 +167,11 @@ gdk_export int GDKms(void);
        ({                                                      \
                void *_ptr = (p);                               \
                size_t _size = (s);                             \
+               char _buf[12];                                  \
+               snprintf(_buf, sizeof(_buf), "%p", _ptr);       \
                void *_res = GDKrealloc(_ptr, _size);           \
-               TRC_DEBUG(ALLOC, "GDKrealloc(%p,%zu) -> %p\n",  \
-                         _ptr, _size, _res);                   \
+               TRC_DEBUG(ALLOC, "GDKrealloc(%s,%zu) -> %p\n",  \
+                         _buf, _size, _res);                   \
                _res;                                           \
         })
 #define GDKfree(p)                                                     \
@@ -238,9 +240,11 @@ gdk_export int GDKms(void);
        ({                                                      \
                void *_ptr = (p);                               \
                size_t _size = (s);                             \
+               char _buf[12];                                  \
+               snprintf(_buf, sizeof(_buf), "%p", _ptr);       \
                void *_res = realloc(_ptr, _size);              \
-               TRC_DEBUG(ALLOC, "realloc(%p,%zu) -> %p\n",     \
-                         _ptr, _size, _res);                   \
+               TRC_DEBUG(ALLOC, "realloc(%s,%zu) -> %p\n",     \
+                         _buf, _size, _res);                   \
                _res;                                           \
         })
 #define free(p)                                                \
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org