Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet
1.1894 05/09/06 18:57:21 msvensson@neptunus.(none) +3 -0
Bug #12715 Compilation of yassl/algebra.ccp fails on buildqnx2
- Workaround
extra/yassl/taocrypt/src/misc.cpp
1.9 05/09/06 18:57:16 msvensson@neptunus.(none) +0 -1
Don't include <new>
extra/yassl/mySTL/list.hpp
1.5 05/09/06 18:57:16 msvensson@neptunus.(none) +2 -2
Use workaround for placement new
extra/yassl/mySTL/helpers.hpp
1.7 05/09/06 18:57:15 msvensson@neptunus.(none) +1 -7
Workaround for QNX
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: msvensson
# Host: neptunus.(none)
# Root: /home/msvensson/mysql/bug12715/my50-bug12715
--- 1.6/extra/yassl/mySTL/helpers.hpp 2005-06-16 13:35:01 +02:00
+++ 1.7/extra/yassl/mySTL/helpers.hpp 2005-09-06 18:57:15 +02:00
@@ -28,14 +28,11 @@
#define mySTL_HELPERS_HPP
#include <stdlib.h>
-#include <new> // placement new
-
-
-#ifdef __IBMCPP__
/*
Workaround for the lack of operator new(size_t, void*)
in IBM VA C++ 6.0
+ Also used as a workaround to avoid including <new>
*/
struct Dummy {};
@@ -45,9 +42,6 @@
}
typedef Dummy* yassl_pointer;
-#else
- typedef void* yassl_pointer;
-#endif
namespace mySTL {
--- 1.4/extra/yassl/mySTL/list.hpp 2005-05-31 17:56:24 +02:00
+++ 1.5/extra/yassl/mySTL/list.hpp 2005-09-06 18:57:16 +02:00
@@ -164,7 +164,7 @@
{
void* mem = malloc(sizeof(node));
if (!mem) abort();
- node* add = new (mem) node(t);
+ node* add = new (reinterpret_cast<yassl_pointer>(mem)) node(t);
if (head_) {
add->next_ = head_;
@@ -210,7 +210,7 @@
{
void* mem = malloc(sizeof(node));
if (!mem) abort();
- node* add = new (mem) node(t);
+ node* add = new (reinterpret_cast<yassl_pointer>(mem)) node(t);
if (tail_) {
tail_->next_ = add;
--- 1.8/extra/yassl/taocrypt/src/misc.cpp 2005-07-01 17:00:54 +02:00
+++ 1.9/extra/yassl/taocrypt/src/misc.cpp 2005-09-06 18:57:16 +02:00
@@ -24,7 +24,6 @@
#include "runtime.hpp"
#include "misc.hpp"
-#include <new> // for NewHandler
void* operator new(size_t sz, TaoCrypt::new_t)
Thread |
---|
• bk commit into 5.0 tree (msvensson:1.1894) BUG#12715 | msvensson | 6 Sep |