Commit 9fa613b6 authored by joreland@mysql.com's avatar joreland@mysql.com

bug#7777 - ndb compile on qnx

  remove usage of compiler supplied <new> and instead
  impl. own inlined placement new
parent b0b8f911
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
#ifndef ATTRIBUTE_HEADER #ifndef ATTRIBUTE_HEADER
#define ATTRIBUTE_HEADER #define ATTRIBUTE_HEADER
#include <new>
/** /**
* @class AttributeHeader * @class AttributeHeader
* @brief Header passed in front of every attribute value in AttrInfo signal * @brief Header passed in front of every attribute value in AttrInfo signal
......
...@@ -138,10 +138,8 @@ static const char table_name_separator = '/'; ...@@ -138,10 +138,8 @@ static const char table_name_separator = '/';
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
#include <new> inline void* operator new(size_t, void* __p) { return __p; }
#endif inline void* operator new[](size_t, void* __p) { return __p; }
#ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
......
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
//=========================================================================== //===========================================================================
#include "Backup.hpp" #include "Backup.hpp"
#include <new>
#include <Properties.hpp> #include <Properties.hpp>
#include <Configuration.hpp> #include <Configuration.hpp>
......
...@@ -39,7 +39,6 @@ ...@@ -39,7 +39,6 @@
#include <EventLogger.hpp> #include <EventLogger.hpp>
#include <TimeQueue.hpp> #include <TimeQueue.hpp>
#include <new>
#include <NdbSleep.h> #include <NdbSleep.h>
#include <SafeCounter.hpp> #include <SafeCounter.hpp>
......
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
#define DBDIH_C #define DBDIH_C
#include "Dbdih.hpp" #include "Dbdih.hpp"
#include <ndb_limits.h> #include <ndb_limits.h>
#include <new>
#define DEBUG(x) { ndbout << "DIH::" << x << endl; } #define DEBUG(x) { ndbout << "DIH::" << x << endl; }
......
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
#define DBLQH_C #define DBLQH_C
#include "Dblqh.hpp" #include "Dblqh.hpp"
#include <ndb_limits.h> #include <ndb_limits.h>
#include <new>
#define DEBUG(x) { ndbout << "LQH::" << x << endl; } #define DEBUG(x) { ndbout << "LQH::" << x << endl; }
......
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#include <ndb_limits.h> #include <ndb_limits.h>
#include <Properties.hpp> #include <Properties.hpp>
#include <Configuration.hpp> #include <Configuration.hpp>
#include <new>
#define DEBUG(x) { ndbout << "TC::" << x << endl; } #define DEBUG(x) { ndbout << "TC::" << x << endl; }
......
...@@ -31,7 +31,6 @@ ...@@ -31,7 +31,6 @@
#include <signaldata/TupKey.hpp> #include <signaldata/TupKey.hpp>
#include <signaldata/DropTab.hpp> #include <signaldata/DropTab.hpp>
#include <new>
#define DEBUG(x) { ndbout << "TUP::" << x << endl; } #define DEBUG(x) { ndbout << "TUP::" << x << endl; }
......
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
#ifndef DBTUX_H #ifndef DBTUX_H
#define DBTUX_H #define DBTUX_H
#include <new>
#include <ndb_limits.h> #include <ndb_limits.h>
#include <SimulatedBlock.hpp> #include <SimulatedBlock.hpp>
#include <AttributeDescriptor.hpp> #include <AttributeDescriptor.hpp>
......
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#include "Grep.hpp" #include "Grep.hpp"
#include <new>
#include <Properties.hpp> #include <Properties.hpp>
#include <Configuration.hpp> #include <Configuration.hpp>
......
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
#include "Suma.hpp" #include "Suma.hpp"
#include <new>
#include <Properties.hpp> #include <Properties.hpp>
#include <Configuration.hpp> #include <Configuration.hpp>
......
...@@ -33,7 +33,6 @@ ...@@ -33,7 +33,6 @@
#include <NdbOut.hpp> #include <NdbOut.hpp>
#include <NdbMutex.h> #include <NdbMutex.h>
#include <NdbSleep.h> #include <NdbSleep.h>
#include <new>
extern "C" { extern "C" {
extern void (* ndb_new_handler)(); extern void (* ndb_new_handler)();
......
...@@ -36,7 +36,6 @@ ...@@ -36,7 +36,6 @@
#include <ErrorReporter.hpp> #include <ErrorReporter.hpp>
#include <ErrorHandlingMacros.hpp> #include <ErrorHandlingMacros.hpp>
#include <new>
#include "DLList.hpp" #include "DLList.hpp"
#include "ArrayPool.hpp" #include "ArrayPool.hpp"
#include "DLHashTable.hpp" #include "DLHashTable.hpp"
......
#include <ndb_types.h> #include <ndb_types.h>
#include <mgmapi.h> #include <mgmapi.h>
#include "mgmapi_configuration.hpp" #include "mgmapi_configuration.hpp"
#include <new>
ndb_mgm_configuration_iterator::ndb_mgm_configuration_iterator ndb_mgm_configuration_iterator::ndb_mgm_configuration_iterator
(const ndb_mgm_configuration & conf, unsigned type_of_section) (const ndb_mgm_configuration & conf, unsigned type_of_section)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment