Changeset 402 for trunk/src/core/time.cc

Timestamp:

06/13/15 21:51:27 (10 years ago)

Author:

epyon

Message:

• cleanups of clang warnings (gotta love them all)
• only nv-core for now (this will take a while for the whole source)
• mainly C++ casts instead of C-style casts, but also a few bugs fixed!

File:

• trunk/src/core/time.cc (modified) (3 diffs)

trunk/src/core/time.cc

@@ -85 +85 @@
 nv::uint32 nv::get_cpu_ms()
 {
-        return (uint32)( (f32)( clock() - zero_timer.clock_zero ) / ( (f32)CLOCKS_PER_SEC / 1000.0 ) ) ;
+        return static_cast<uint32>( static_cast<f32>( clock() - zero_timer.clock_zero ) / ( static_cast<f32>(CLOCKS_PER_SEC) / 1000.0f ) ) ;
 }
 
 nv::uint64 nv::get_cpu_us()
 {
-        return (uint64)( (f32)( clock() - zero_timer.clock_zero ) / ( (f32)CLOCKS_PER_SEC / 1000000.0 ) ) ;
+        return static_cast<uint64>( static_cast<f32>( clock() - zero_timer.clock_zero ) / ( static_cast<f32>(CLOCKS_PER_SEC) / 1000000.0f ) ) ;
 }
 
@@ -99 +99 @@
         QueryPerformanceCounter(&now);
         LONGLONG result = now.QuadPart - zero_timer.query_zero.QuadPart;
-        return (uint32) (1000.0 * result / (double) zero_timer.frequency.QuadPart);
+        return static_cast<uint32>(1000.0 * result / static_cast<f64>( zero_timer.frequency.QuadPart ) );
 #else
         struct timeval now;
         gettimeofday(&now, NULL);
-        return (uint32)( (now.tv_sec - zero_timer.timeval_zero.tv_sec)*1000+(now.tv_usec-zero_timer.timeval_zero.tv_usec)/1000 );
+        return static_cast<uint32>( (now.tv_sec - zero_timer.timeval_zero.tv_sec)*1000+(now.tv_usec-zero_timer.timeval_zero.tv_usec)/1000 );
 #endif
 }
@@ -113 +113 @@
         QueryPerformanceCounter(&now);
         LONGLONG result = now.QuadPart - zero_timer.query_zero.QuadPart;
-        return (uint64) (1000000.0 * result / (double) zero_timer.frequency.QuadPart);
+        return static_cast<uint64>(1000000.0 * result / static_cast<f64>( zero_timer.frequency.QuadPart ) );
 #else
         struct timeval now;
         gettimeofday(&now, NULL);
-        return (uint32)( (now.tv_sec - zero_timer.timeval_zero.tv_sec)*1000000+(now.tv_usec - zero_timer.timeval_zero.tv_usec) );
+        return static_cast<uint64>( (now.tv_sec - zero_timer.timeval_zero.tv_sec)*1000000+(now.tv_usec - zero_timer.timeval_zero.tv_usec) );
 #endif
 }