[Android] Fix Timer::getMilliseconds randomly returning large numbers

Also make iOS match Android & Linux just in case.
OGRECave · Aug 14, 2023 · 2057102 · 2057102
1 parent edf4271
commit 2057102
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/OgreMain/src/Android/OgreTimer.cpp b/OgreMain/src/Android/OgreTimer.cpp
@@ -53,16 +53,16 @@ uint64 Timer::getMilliseconds()
 {
     struct timeval now;
     gettimeofday( &now, NULL );
-    return static_cast<uint64>( now.tv_sec - start.tv_sec ) * 1000 +
-           static_cast<uint64>( now.tv_usec - start.tv_usec ) / 1000;
+    return static_cast<uint64>( now.tv_sec - start.tv_sec ) * 1000ul +
+           static_cast<uint64>( ( now.tv_usec - start.tv_usec ) / 1000l );
 }
 
 //--------------------------------------------------------------------------------//
 uint64 Timer::getMicroseconds()
 {
     struct timeval now;
     gettimeofday( &now, NULL );
-    return static_cast<uint64>( now.tv_sec - start.tv_sec ) * 1000000 +
+    return static_cast<uint64>( now.tv_sec - start.tv_sec ) * 1000000ul +
            static_cast<uint64>( now.tv_usec - start.tv_usec );
 }
 

diff --git a/OgreMain/src/iOS/OgreTimer.cpp b/OgreMain/src/iOS/OgreTimer.cpp
@@ -53,16 +53,16 @@ uint64 Timer::getMilliseconds()
 {
     struct timeval now;
     gettimeofday( &now, NULL );
-    return static_cast<uint64>( now.tv_sec - start.tv_sec ) * 1000 +
-           static_cast<uint64>( ( now.tv_usec - start.tv_usec ) / 1000 );
+    return static_cast<uint64>( now.tv_sec - start.tv_sec ) * 1000ul +
+           static_cast<uint64>( ( now.tv_usec - start.tv_usec ) / 1000l );
 }
 
 //--------------------------------------------------------------------------------//
 uint64 Timer::getMicroseconds()
 {
     struct timeval now;
     gettimeofday( &now, NULL );
-    return static_cast<uint64>( now.tv_sec - start.tv_sec ) * 1000000 +
+    return static_cast<uint64>( now.tv_sec - start.tv_sec ) * 1000000ul +
            static_cast<uint64>( now.tv_usec - start.tv_usec );
 }