Changeset 402 for trunk/src/core/logger.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/logger.cc (modified) (5 diffs)

trunk/src/core/logger.cc

@@ -89 +89 @@
         for ( auto& sink_info : m_log_sinks )
         {
-                if ( sink_info.sink && (sink_info.level >= (uint32)level) )
+                if ( sink_info.sink && (sink_info.level >= static_cast<uint32>( level ) ) )
                 {
                         // log and iterate
@@ -106 +106 @@
                 {
                         sink_info.sink  = sink;
-                        sink_info.level = (uint32)level;
+                        sink_info.level = static_cast<uint32>( level );
                         return;
                 }
@@ -194 +194 @@
         //if ( m_flush ) FlushFileBuffers( m_handle );
 #else
-        fwrite( stamp, ssize, 1, (FILE*)m_handle );
-        fwrite( " [", 2, 1, (FILE*)m_handle );
-        fwrite( NV_LOG_LEVEL_NAME_PAD( level ), 8, 1, (FILE*)m_handle );
-        fwrite( "] ", 2, 1, (FILE*)m_handle );
-        fwrite( message.data(), message.size(), 1, (FILE*)m_handle );
-        fwrite( "\n", 1, 1, (FILE*)m_handle );
-        if ( m_flush ) fflush( (FILE*)m_handle );
+        FILE* file = static_cast<FILE*>( m_handle );
+        fwrite( stamp, ssize, 1, file );
+        fwrite( " [", 2, 1, file );
+        fwrite( NV_LOG_LEVEL_NAME_PAD( level ), 8, 1, file );
+        fwrite( "] ", 2, 1, file );
+        fwrite( message.data(), message.size(), 1, file );
+        fwrite( "\n", 1, 1, file );
+        if ( m_flush ) fflush( file );
 #endif
 }
@@ -226 +227 @@
         CloseHandle( m_handle );
 #else
-        fclose( (FILE*) m_handle );
+        fclose( static_cast<FILE*>( m_handle ) );
 #endif
 }
@@ -244 +245 @@
 {
         uint32 ms = get_system_ms();
-        unsigned int secs = (unsigned int)(ms / 1000);
-        unsigned int mm   = (unsigned int)( ms * 100 / 1000 ) % 100;
-        unsigned int h    = (unsigned int)(secs / (60*60));
-        unsigned int m    = (unsigned int)(secs / 60) % 60;
+        unsigned int secs = static_cast<unsigned int>( ms / 1000 );
+        unsigned int mm   = static_cast<unsigned int>( ms * 100 / 1000 ) % 100;
+        unsigned int h    = static_cast<unsigned int>( secs / (60*60) );
+        unsigned int m    = static_cast<unsigned int>( secs / 60 ) % 60;
         unsigned int s    = secs % 60;
 #if NV_COMPILER == NV_MSVC