Commit 2f886b93 authored by unknown's avatar unknown

Bug #12715 Compilation of yassl/algebra.ccp fails on buildqnx2

 - Workaround


extra/yassl/mySTL/helpers.hpp:
  Workaround for QNX
extra/yassl/mySTL/list.hpp:
  Use workaround for placement new
extra/yassl/taocrypt/src/misc.cpp:
  Don't include <new>
parent a34ca4bf
......@@ -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 {
......
......@@ -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;
......
......@@ -24,7 +24,6 @@
#include "runtime.hpp"
#include "misc.hpp"
#include <new> // for NewHandler
void* operator new(size_t sz, TaoCrypt::new_t)
......
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