Changeset - r3904:2d1f8ae172a9
[Not reviewed]
master
0 2 0
KUDr - 18 years ago 2006-05-27 18:52:28
kudr@openttd.org
(svn r4992) - Fix: [YAPF] error "too many arguments to function `void * operator new(unsigned int)'" on MorphOS
2 files changed with 1 insertions and 2 deletions:
0 comments (0 inline, 0 general)
yapf/binaryheap.hpp
Show inline comments
 
/* $Id$ */
 

	
 
#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) {}
 
#endif
 

	
 

	
 
/**
 
* Binary Heap as C++ template.
 
*
 
* For information about Binary Heap algotithm,
 
*   see: http://www.policyalmanac.org/games/binaryHeaps.htm
 
*
yapf/yapf.hpp
Show inline comments
 
@@ -20,24 +20,25 @@ EXTERN_C_BEGIN
 
#include "yapf.h"
 
#include "../pathfind.h"
 
#include "../waypoint.h"
 
#include "../debug.h"
 
EXTERN_C_END
 

	
 
EXTERN_C_BEGIN
 
	extern Patches _patches_newgame;
 
	extern uint64 _rdtsc(void);
 
EXTERN_C_END
 

	
 
#include <limits.h>
 
#include <new>
 

	
 
#if defined(_WIN32) || defined(_WIN64)
 
#  include <windows.h>
 
#else
 
#  include <time.h>
 
#endif
 

	
 
struct CPerformanceTimer
 
{
 
	int64    m_start;
 
	int64    m_acc;
 

	
0 comments (0 inline, 0 general)