summaryrefslogtreecommitdiff
path: root/lib/common/MemLeakFinder.h
diff options
context:
space:
mode:
Diffstat (limited to 'lib/common/MemLeakFinder.h')
-rw-r--r--lib/common/MemLeakFinder.h9
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