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

Jump to bottom

msys2 fix multiple definition issue #1416

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

msys2 fix multiple definition issue #1416

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9669510
msys2 fix multiple definition issue
giuspen Aug 26, 2020
38c7aa3
fix msys2 not to break cygwin
giuspen Sep 8, 2020
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
12 changes: 10 additions & 2 deletions src/CppUTest/MemoryLeakWarningPlugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,10 +312,12 @@ static void (*saved_operator_delete_fptr)(void* mem) UT_NOTHROW = mem_leak_opera
static void (*saved_operator_delete_array_fptr)(void* mem) UT_NOTHROW = mem_leak_operator_delete_array;
static int save_counter = 0;

#if defined(__CYGWIN__) || !defined(__MINGW32__)
void* operator new(size_t size) UT_THROW(std::bad_alloc)
{
return operator_new_fptr(size);
}
#endif // defined(__CYGWIN__) || !defined(__MINGW32__)

void* operator new(size_t size, const char* file, size_t line) UT_THROW(std::bad_alloc)
{
Expand All @@ -332,27 +334,33 @@ void operator delete(void* mem, const char*, size_t) UT_NOTHROW
operator_delete_fptr(mem);
}

#if defined(__CYGWIN__) || !defined(__MINGW32__)
#if __cplusplus >= 201402L
void operator delete (void* mem, size_t) UT_NOTHROW
{
operator_delete_fptr(mem);
}
#endif
#endif // __cplusplus >= 201402L
#endif // defined(__CYGWIN__) || !defined(__MINGW32__)

#if defined(__CYGWIN__) || !defined(__MINGW32__)
void* operator new[](size_t size) UT_THROW(std::bad_alloc)
{
return operator_new_array_fptr(size);
}
#endif // defined(__CYGWIN__) || !defined(__MINGW32__)

void* operator new [](size_t size, const char* file, size_t line) UT_THROW(std::bad_alloc)
{
return operator_new_array_debug_fptr(size, file, line);
}

#if defined(__CYGWIN__) || !defined(__MINGW32__)
void operator delete[](void* mem) UT_NOTHROW
{
operator_delete_array_fptr(mem);
operator_delete_array_fptr(mem);
}
#endif // defined(__CYGWIN__) || !defined(__MINGW32__)

void operator delete[](void* mem, const char*, size_t) UT_NOTHROW
{
Expand Down