diff options
author | glx <glx@openttd.org> | 2006-09-06 14:24:43 +0000 |
---|---|---|
committer | glx <glx@openttd.org> | 2006-09-06 14:24:43 +0000 |
commit | f70064e7aa32e7b725a4038a575d839e1c279944 (patch) | |
tree | 1647d1786493bdb7a1cb6c2c650ddb8a08c926a5 /yapf/yapf.hpp | |
parent | 39ba62d48fbcc549833175c4d421b66a27141b0e (diff) | |
download | openttd-f70064e7aa32e7b725a4038a575d839e1c279944.tar.xz |
(svn r6411) -Fix(r6410): forgot to update openttd*.sln (thx Darkvater and michi_cc :) )
-Cleanup: Removed UNITTEST preprocessor checks
Diffstat (limited to 'yapf/yapf.hpp')
-rw-r--r-- | yapf/yapf.hpp | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/yapf/yapf.hpp b/yapf/yapf.hpp index f9c3f4720..208f29c46 100644 --- a/yapf/yapf.hpp +++ b/yapf/yapf.hpp @@ -49,28 +49,8 @@ struct CPerformanceTimer FORCEINLINE void Stop() {m_acc += QueryTime() - m_start;} FORCEINLINE int Get(int64 coef) {return (int)(m_acc * coef / QueryFrequency());} -#if !defined(UNITTEST) && 1 FORCEINLINE int64 QueryTime() {return _rdtsc();} FORCEINLINE int64 QueryFrequency() {return ((int64)2200 * 1000000);} -#elif defined(_WIN32) || defined(_WIN64) - FORCEINLINE int64 QueryTime() {LARGE_INTEGER c; QueryPerformanceCounter(&c); return c.QuadPart;} - FORCEINLINE int64 QueryFrequency() {LARGE_INTEGER f; QueryPerformanceFrequency(&f); return f.QuadPart;} -#elif defined(CLOCK_THREAD_CPUTIME_ID) - FORCEINLINE int64 QueryTime() - { - timespec ts; - int ret = clock_gettime(CLOCK_THREAD_CPUTIME_ID, &ts); - if (ret != 0) return 0; - return (ts.tv_sec * 1000000000LL) + ts.tv_nsec; - } - FORCEINLINE int64 QueryFrequency() - { - return 1000000000; - } -#else - int64 QueryTime() {return 0;} - int64 QueryFrequency() {return 1;} -#endif }; struct CPerfStartReal |