Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into master-Mudlet
Browse files Browse the repository at this point in the history
  • Loading branch information
vadi2 committed Aug 13, 2019
2 parents e8e1a71 + 55b7eda commit 409834a
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions edbee-lib/edbee/util/mem/debug_new.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@
#include <malloc.h>
#endif


#if defined(EDBEE_DEBUG)
#define debug_new_log // printf

/// Logs a malloc operation
/// @param size the size of reseved bytes
/// @param file the file of the malloc
/// @param line the line number of the allocation
void* debug_malloc(size_t size, const char* file, const int line)
{
{
edbee::DebugAllocationList* allocList = edbee::DebugAllocationList::instance();
QMutexLocker lock(allocList->mutex());

Expand Down Expand Up @@ -112,7 +112,7 @@ void operator delete[] (void* p) throw()
{
return debug_free(p, "unknown", 0);
}

#endif


namespace edbee {
Expand Down

0 comments on commit 409834a

Please sign in to comment.