diff options
| author | KUDr <kudr@openttd.org> | 2006-05-27 18:52:28 +0000 |
|---|---|---|
| committer | KUDr <kudr@openttd.org> | 2006-05-27 18:52:28 +0000 |
| commit | ff791261de20d26ef3c5df1e5079bb63abb07d81 (patch) | |
| tree | 5e21ded353b97d43ed30910e70fc7be8585c51f2 | |
| parent | 08c5ee6edceaa4f55daeb6c5efbe7c9b4dc1697a (diff) | |
| download | openttd-ff791261de20d26ef3c5df1e5079bb63abb07d81.tar.xz | |
(svn r4992) - Fix: [YAPF] error "too many arguments to function `void * operator new(unsigned int)'" on MorphOS
| -rw-r--r-- | yapf/binaryheap.hpp | 2 | ||||
| -rw-r--r-- | yapf/yapf.hpp | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/yapf/binaryheap.hpp b/yapf/binaryheap.hpp index d2ef6e4b8..1191b32fd 100644 --- a/yapf/binaryheap.hpp +++ b/yapf/binaryheap.hpp @@ -3,8 +3,6 @@ #ifndef BINARYHEAP_HPP #define BINARYHEAP_HPP -#include <new> - //void* operator new (size_t size, void* p) {return p;} #if defined(_MSC_VER) && (_MSC_VER >= 1400) //void operator delete (void* p, void* p2) {} diff --git a/yapf/yapf.hpp b/yapf/yapf.hpp index d4f7b6936..6c7044310 100644 --- a/yapf/yapf.hpp +++ b/yapf/yapf.hpp @@ -29,6 +29,7 @@ EXTERN_C_BEGIN EXTERN_C_END #include <limits.h> +#include <new> #if defined(_WIN32) || defined(_WIN64) # include <windows.h> |