Changeset 376 for trunk/src/core/logger.cc

Timestamp:

05/28/15 10:21:10 (10 years ago)

Author:

epyon

Message:

• stl/assert.hh, stl/capi.hh, size_t independent
• GCC 4.8 compatibility
• using template usage
• various minor changes

File:

• trunk/src/core/logger.cc (modified) (7 diffs)

trunk/src/core/logger.cc

@@ -8 +8 @@
 #include "nv/core/time.hh"
 #include <cstdio>
-#if NV_PLATFORM == NV_WINDOWS
+#if NV_COMPILER == NV_MSVC 
 #define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
@@ -51 +51 @@
 #define NV_LOG_LEVEL_NAME_PAD(level) (log_level_names_pad[ (level) / 10 ])
 
-#if NV_PLATFORM == NV_WINDOWS 
+#if NV_COMPILER == NV_MSVC 
 static unsigned short log_color[] =
 {
@@ -145 +145 @@
         size_t ssize = timestamp( stamp );
 
-#if NV_PLATFORM == NV_WINDOWS 
+#if NV_COMPILER == NV_MSVC 
         if ( m_color ) SetConsoleTextAttribute( m_handle, FOREGROUND_INTENSITY );
         WriteConsole( m_handle, stamp, ssize, nullptr, nullptr );
@@ -170 +170 @@
         else
                 fwrite( "] ", 2, 1, stdout );
-        fwrite( stamp.data(), stamp.size(), 1, stdout );
+        fwrite( message.data(), message.size(), 1, stdout );
         fwrite( "\n", 1, 1, stdout );
 #endif
@@ -233 +233 @@
         : m_color( coloring )
 {
-#if NV_PLATFORM == NV_WINDOWS 
+#if NV_COMPILER == NV_MSVC 
         m_handle = GetStdHandle( STD_OUTPUT_HANDLE );
 #else
@@ -240 +240 @@
 }
 
-size_t nv::log_sink::timestamp( char* buffer ) const
+nv::size_t nv::log_sink::timestamp( char* buffer ) const
 {
         uint32 ms = get_system_ms();
@@ -248 +248 @@
         unsigned int m    = (unsigned int)(secs / 60) % 60;
         unsigned int s    = secs % 60;
-#if NV_PLATFORM == NV_WINDOWS 
+#if NV_COMPILER == NV_MSVC 
         sprintf_s( buffer, 16, "%02d:%02d:%02d.%02d", h, m, s, mm );
 #else