Skip to content

Commit

Permalink
Removed errant uses of uint64_t
Browse files Browse the repository at this point in the history
fixes #894
  • Loading branch information
philsquared committed Apr 25, 2017
1 parent fc7f0a0 commit e4694f5
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions include/internal/catch_timer.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,21 +28,21 @@ namespace Catch {

namespace {
#ifdef CATCH_PLATFORM_WINDOWS
uint64_t getCurrentTicks() {
static uint64_t hz=0, hzo=0;
UInt64 getCurrentTicks() {
static UInt64 hz=0, hzo=0;
if (!hz) {
QueryPerformanceFrequency( reinterpret_cast<LARGE_INTEGER*>( &hz ) );
QueryPerformanceCounter( reinterpret_cast<LARGE_INTEGER*>( &hzo ) );
}
uint64_t t;
UInt64 t;
QueryPerformanceCounter( reinterpret_cast<LARGE_INTEGER*>( &t ) );
return ((t-hzo)*1000000)/hz;
}
#else
uint64_t getCurrentTicks() {
UInt64 getCurrentTicks() {
timeval t;
gettimeofday(&t,CATCH_NULL);
return static_cast<uint64_t>( t.tv_sec ) * 1000000ull + static_cast<uint64_t>( t.tv_usec );
return static_cast<UInt64>( t.tv_sec ) * 1000000ull + static_cast<UInt64>( t.tv_usec );
}
#endif
}
Expand Down

0 comments on commit e4694f5

Please sign in to comment.