mirror of
https://github.com/MariaDB/server.git
synced 2025-12-24 11:21:21 +03:00
Changes to fix building on Windows.
include/my_global.h: Using Standard C++ header file <new> instead of defining all the versions of operator new and operator delete ourself.
This commit is contained in:
@@ -1479,14 +1479,10 @@ do { doubleget_union _tmp; \
|
||||
#endif
|
||||
|
||||
/*
|
||||
Define placement versions of operator new and operator delete since
|
||||
we cannot be sure that the <new> include exists.
|
||||
Include standard definitions of operator new and delete.
|
||||
*/
|
||||
#ifdef __cplusplus
|
||||
inline void *operator new(size_t, void *ptr) { return ptr; }
|
||||
inline void *operator new[](size_t, void *ptr) { return ptr; }
|
||||
inline void operator delete(void*, void*) { /* Do nothing */ }
|
||||
inline void operator delete[](void*, void*) { /* Do nothing */ }
|
||||
#include <new>
|
||||
#endif
|
||||
|
||||
#endif /* my_global_h */
|
||||
|
||||
Reference in New Issue
Block a user