diff options
| author | unknown <mats@romeo.(none)> | 2007-02-24 17:33:58 +0100 |
|---|---|---|
| committer | unknown <mats@romeo.(none)> | 2007-02-24 17:33:58 +0100 |
| commit | c13e1694adf58aacc7705b696690c781575d9b21 (patch) | |
| tree | 10348b61bfa5476889ed3b7631b6f72f6a5c263f /include/my_global.h | |
| parent | 67d0f8cf0bc85aff3ea5b3b4186f7b34b2a6aea7 (diff) | |
| download | mariadb-git-c13e1694adf58aacc7705b696690c781575d9b21.tar.gz | |
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.
Diffstat (limited to 'include/my_global.h')
| -rw-r--r-- | include/my_global.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/include/my_global.h b/include/my_global.h index d92e5f07948..acf19fef8c0 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -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 */ |