diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2017-06-14 19:53:34 -0400 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2017-06-14 19:55:14 -0400 |
| commit | e0c122119afea4c951c0c57144d26a473118c254 (patch) | |
| tree | 34a02a56f9b017201dfb721ef678c711351466d6 /lib/common/MemLeakFinder.h | |
| parent | e0eb815b67734abd09ff41e2271630d4b2a6d760 (diff) | |
Fixup botched merge
Diffstat (limited to 'lib/common/MemLeakFinder.h')
| -rw-r--r-- | lib/common/MemLeakFinder.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/lib/common/MemLeakFinder.h b/lib/common/MemLeakFinder.h index e4e9a1ae..1a2cf90c 100644 --- a/lib/common/MemLeakFinder.h +++ b/lib/common/MemLeakFinder.h @@ -28,10 +28,7 @@ class MemLeakSuppressionGuard extern "C" { void *memleakfinder_malloc(size_t size, const char *file, int line); -<<<<<<< HEAD -======= void *memleakfinder_calloc(size_t blocks, size_t size, const char *file, int line); ->>>>>>> 0.12 void *memleakfinder_realloc(void *ptr, size_t size); void memleakfinder_free(void *ptr); } @@ -40,11 +37,8 @@ void memleakfinder_init(); int memleakfinder_numleaks(); -<<<<<<< HEAD -======= void memleakfinder_report_usage_summary(); ->>>>>>> 0.12 void memleakfinder_reportleaks(); void memleakfinder_reportleaks_appendfile(const char *filename, const char *markertext); @@ -63,10 +57,7 @@ void *operator new[](size_t size, const char *file, int line); // define the malloc functions now, if required #ifdef MEMLEAKFINDER_FULL_MALLOC_MONITORING #define malloc(X) memleakfinder_malloc(X, __FILE__, __LINE__) -<<<<<<< HEAD -======= #define calloc(X, Y) memleakfinder_calloc(X, Y, __FILE__, __LINE__) ->>>>>>> 0.12 #define realloc memleakfinder_realloc #define free memleakfinder_free #define MEMLEAKFINDER_MALLOC_MONITORING_DEFINED |