diff options
| author | unknown <joreland@mysql.com> | 2005-01-19 09:15:34 +0100 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2005-01-19 09:15:34 +0100 |
| commit | ed327104b6803959f7f5acb4dc84afd117ad26b4 (patch) | |
| tree | 1538a8dfef5064f6b0828806895fa73ae188c926 /ndb/include/ndb_global.h.in | |
| parent | 153160d1ffd9d118867c3e5c41474f435e5c981f (diff) | |
| download | mariadb-git-ed327104b6803959f7f5acb4dc84afd117ad26b4.tar.gz | |
bug#7777 - ndb compile on qnx
remove usage of compiler supplied <new> and instead
impl. own inlined placement new
ndb/include/kernel/AttributeHeader.hpp:
remove usage <new>
ndb/include/ndb_global.h.in:
remove usage <new>
instead impl. own
ndb/src/kernel/blocks/backup/BackupInit.cpp:
remove usage <new>
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
remove usage <new>
ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
remove usage <new>
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
remove usage <new>
ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
remove usage <new>
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
remove usage <new>
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
remove usage <new>
ndb/src/kernel/blocks/grep/GrepInit.cpp:
remove usage <new>
ndb/src/kernel/blocks/suma/SumaInit.cpp:
remove usage <new>
ndb/src/kernel/vm/Emulator.cpp:
remove usage <new>
ndb/src/kernel/vm/SimulatedBlock.hpp:
remove usage <new>
ndb/src/mgmapi/mgmapi_configuration.cpp:
remove usage <new>
Diffstat (limited to 'ndb/include/ndb_global.h.in')
| -rw-r--r-- | ndb/include/ndb_global.h.in | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/ndb/include/ndb_global.h.in b/ndb/include/ndb_global.h.in index d7a5cb1b1cf..eadd5e37b9b 100644 --- a/ndb/include/ndb_global.h.in +++ b/ndb/include/ndb_global.h.in @@ -138,10 +138,8 @@ static const char table_name_separator = '/'; #endif #ifdef __cplusplus -#include <new> -#endif - -#ifdef __cplusplus +inline void* operator new(size_t, void* __p) { return __p; } +inline void* operator new[](size_t, void* __p) { return __p; } extern "C" { #endif |