forked from mirror/OpenTTD
(svn r4992) - Fix: [YAPF] error "too many arguments to function `void * operator new(unsigned int)'" on MorphOS
This commit is contained in:
@@ -3,8 +3,6 @@
|
|||||||
#ifndef BINARYHEAP_HPP
|
#ifndef BINARYHEAP_HPP
|
||||||
#define BINARYHEAP_HPP
|
#define BINARYHEAP_HPP
|
||||||
|
|
||||||
#include <new>
|
|
||||||
|
|
||||||
//void* operator new (size_t size, void* p) {return p;}
|
//void* operator new (size_t size, void* p) {return p;}
|
||||||
#if defined(_MSC_VER) && (_MSC_VER >= 1400)
|
#if defined(_MSC_VER) && (_MSC_VER >= 1400)
|
||||||
//void operator delete (void* p, void* p2) {}
|
//void operator delete (void* p, void* p2) {}
|
||||||
|
@@ -29,6 +29,7 @@ EXTERN_C_BEGIN
|
|||||||
EXTERN_C_END
|
EXTERN_C_END
|
||||||
|
|
||||||
#include <limits.h>
|
#include <limits.h>
|
||||||
|
#include <new>
|
||||||
|
|
||||||
#if defined(_WIN32) || defined(_WIN64)
|
#if defined(_WIN32) || defined(_WIN64)
|
||||||
# include <windows.h>
|
# include <windows.h>
|
||||||
|
Reference in New Issue
Block a user