bzr commit into mysql-5.1-telco-7.1 branch (frazer:3740)

[Frazer Clement]

#At file:///home/frazer/bzr/mysql-5.1-telco-7.1-vzw/ based on revid:frazer@stripped

 3740 Frazer Clement	2010-12-03
      Add defined required for later patch to special branch

    modified:
      storage/ndb/include/kernel/signaldata/SignalData.hpp
      storage/ndb/src/ndbapi/NdbApiSignal.hpp
=== modified file 'storage/ndb/include/kernel/signaldata/SignalData.hpp'
--- a/storage/ndb/include/kernel/signaldata/SignalData.hpp	2009-11-08 12:52:27 +0000
+++ b/storage/ndb/include/kernel/signaldata/SignalData.hpp	2010-12-03 15:58:43 +0000
@@ -30,6 +30,25 @@
 
 #define SECTION(x) STATIC_CONST(x)
 
+template <typename T>
+inline
+T*
+cast_ptr(Uint32 * ptr)
+{
+  return new (ptr) T;
+}
+
+template <typename T>
+inline
+const T*
+cast_constptr(const Uint32 * ptr)
+{
+  return const_cast<const T*>(new (const_cast<Uint32*>(ptr)) T);
+}
+
+#define CAST_PTR(Y,X) cast_ptr<Y>(X)
+#define CAST_CONSTPTR(Y,X) cast_constptr<Y>(X)
+
 // defines for setter and getters on commonly used member data in signals
 
 #define GET_SET_SENDERDATA \

=== modified file 'storage/ndb/src/ndbapi/NdbApiSignal.hpp'
--- a/storage/ndb/src/ndbapi/NdbApiSignal.hpp	2010-03-21 19:05:55 +0000
+++ b/storage/ndb/src/ndbapi/NdbApiSignal.hpp	2010-12-03 15:58:43 +0000
@@ -37,9 +37,6 @@
 #include <TransporterDefinitions.hpp>
 #include "Ndb.hpp"
 
-#define CAST_PTR(X,Y) reinterpret_cast<X*>(Y)
-#define CAST_CONSTPTR(X,Y) reinterpret_cast<const X*>(Y)
-
 #include <signaldata/GetTabInfo.hpp>
 #include <signaldata/DictTabInfo.hpp>
 #include <signaldata/CreateTable.hpp>


Attachment: [text/bzr-bundle] bzr/[e-mail]