Commit 20a72bad authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 

into  neptunus.(none):/home/msvensson/mysql/bug12715/my50-bug12715
parents 9e7a1bb2 2f886b93

extra/yassl/mySTL/helpers.hpp

+1 −7
Original line number Diff line number Diff line
@@ -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 {

extra/yassl/mySTL/list.hpp

+2 −2
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ void list<T>::push_front(T t) 
{

    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 list<T>::push_back(T t) 
{

    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;

extra/yassl/taocrypt/src/misc.cpp

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 


#include "runtime.hpp"

#include "misc.hpp"

#include <new>        // for NewHandler





void* operator new(size_t sz, TaoCrypt::new_t)