Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to latest upstream edbee #2

Merged
merged 3 commits into from
Aug 13, 2019
Merged

Update to latest upstream edbee #2

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
98a823c
Only use EDBEE_DEBUG when asked for
vadi2 Jul 26, 2019
55b7eda
Merge pull request #92 from vadi2/patch-1
gamecreature Jul 29, 2019
409834a
Merge remote-tracking branch 'origin/master' into master-Mudlet
vadi2 Aug 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions edbee-lib/edbee/util/mem/debug_new.cpp
View file
Open in desktop
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