MonetDB: Oct2020 - Merge with Jun2020 branch.

[Sjoerd Mullender]

Changeset: 89f904bae064 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/89f904bae064
Modified Files:
        .hgtags
        gdk/gdk_utils.h
Branch: Oct2020
Log Message:

Merge with Jun2020 branch.


diffs (39 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -803,3 +803,4 @@ 6b71a8cc3498561815ac88d6c652922359efd13a
 5cb19dc0880d1fb4799cd0f8019d1c2b430c503e Oct2020_17
 5cb19dc0880d1fb4799cd0f8019d1c2b430c503e Oct2020_SP5_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
@@ -162,9 +162,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)                                                     \
@@ -233,9 +235,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