Scarfski/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2026-10-11 11:25:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1398 from Lectem/fix/concurrentqueue-and-malloc-define

Browse Source 
WORKAROUND_malloc/free should properly route to tracy_malloc/free
This commit is contained in:
Bartosz Taudul
2026-06-10 17:57:32 +02:00
committed by GitHub
parent 66e4f5cef7 bfab6d03f4
commit 9ab39d8af3
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/client/tracy_concurrentqueue.h
View File

@@ -171,8 +171,8 @@ struct ConcurrentQueueDefaultTraits
#if defined(malloc) || defined(free)
// Gah, this is 2015, stop defining macros that break standard code already!
// Work around malloc/free being special macros:
static inline void* WORKAROUND_malloc(size_t size) { return malloc(size); }
static inline void WORKAROUND_free(void* ptr) { return free(ptr); }
static inline void* WORKAROUND_malloc(size_t size) { return tracy::tracy_malloc(size); }
static inline void WORKAROUND_free(void* ptr) { return tracy::tracy_free(ptr); }
static inline void* (malloc)(size_t size) { return WORKAROUND_malloc(size); }
static inline void (free)(void* ptr) { return WORKAROUND_free(ptr); }
#else