From 9360e80a56ee0fd5536d3198f1611726a97a0e75 Mon Sep 17 00:00:00 2001 From: Pavel Krajcevski Date: Wed, 7 Nov 2012 15:21:02 -0500 Subject: [PATCH] Fix issues with stop watch on windows. --- Core/src/StopWatchWin32.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Core/src/StopWatchWin32.cpp b/Core/src/StopWatchWin32.cpp index bace45c..6f6025c 100755 --- a/Core/src/StopWatchWin32.cpp +++ b/Core/src/StopWatchWin32.cpp @@ -19,12 +19,14 @@ #include "TexCompTypes.h" #include +#include class StopWatchImpl { +public: uint64 frequency; uint64 start; uint64 stop; - uintptr affinityMask; + uintptr_t affinityMask; StopWatchImpl() : start(0), stop(0), affinityMask(0) @@ -108,7 +110,7 @@ double StopWatch::TimeInSeconds() const { // Return the elapsed time in seconds. assert((impl->stop - impl->start) > 0); - return double(impl->stop - impl->start) / double(frequency); + return double(impl->stop - impl->start) / double(impl->frequency); } // Get the elapsed time in milliseconds. @@ -116,7 +118,7 @@ double StopWatch::TimeInMilliseconds() const { // Return the elapsed time in milliseconds. assert((impl->stop - impl->start) > 0); - return double(impl->stop - impl->start) / double(frequency) * 1000.0; + return double(impl->stop - impl->start) / double(impl->frequency) * 1000.0; } // Get the elapsed time in microseconds.