Changeset 121 for trunk/src/time.cc

Timestamp:

06/15/13 17:47:57 (12 years ago)

Author:

epyon

Message:

• Nova builds with -Weverything/-Wall/-pedantic/etc on: on MSVC 2012 on GCC 4.6.3 on clang 3.2
• ... without a single fucking warning.

File:

• trunk/src/time.cc (modified) (4 diffs)

trunk/src/time.cc

@@ -42 +42 @@
 static timer_impl zero_timer;
 
-volatile nv::uint64 nv::get_ticks()
+nv::uint64 nv::get_ticks()
 {
 #if NV_COMPILER == NV_MSVC
         return __rdtsc();
-#elif NV_COMPILER == NV_GNUC
-        register long long ticks asm("eax");
+#else
+        register long long ticks asm("eax") = 0;
         asm volatile (".byte 15, 49" : : : "eax", "edx");
-        return ticks;
-#else
-        return 0; // unsupported
+        return static_cast<nv::uint64>( ticks );
 #endif
 }
@@ -59 +57 @@
 #if NV_COMPILER == NV_MSVC
         Sleep( ms );
-#elif NV_COMPILER == NV_GNUC
+#else
         usleep( ms * 1000 );
-#else
 #endif
 }
@@ -85 +82 @@
         struct timeval now;
         gettimeofday(&now, NULL);
-        return (now.tv_sec - zero_timer.timeval_zero.tv_sec)*1000+(now.tv_usec-zero_timer.timeval_zero.tv_usec)/1000;
+        return (uint32)( (now.tv_sec - zero_timer.timeval_zero.tv_sec)*1000+(now.tv_usec-zero_timer.timeval_zero.tv_usec)/1000 );
 #endif
 }
@@ -99 +96 @@
         struct timeval now;
         gettimeofday(&now, NULL);
-        return (now.tv_sec - zero_timer.timeval_zero.tv_sec)*1000000+(now.tv_usec - zero_timer.timeval_zero.tv_usec);
+        return (uint32)( (now.tv_sec - zero_timer.timeval_zero.tv_sec)*1000000+(now.tv_usec - zero_timer.timeval_zero.tv_usec) );
 #endif
 }