Changeset 376 for trunk/src/core


Ignore:
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
Location:
trunk/src/core
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/core/logger.cc

    r368 r376  
    88#include "nv/core/time.hh"
    99#include <cstdio>
    10 #if NV_PLATFORM == NV_WINDOWS
     10#if NV_COMPILER == NV_MSVC
    1111#define WIN32_LEAN_AND_MEAN
    1212#include <Windows.h>
    … …  
    5151#define NV_LOG_LEVEL_NAME_PAD(level) (log_level_names_pad[ (level) / 10 ])
    5252
    53 #if NV_PLATFORM == NV_WINDOWS
     53#if NV_COMPILER == NV_MSVC
    5454static unsigned short log_color[] =
    5555{
    … …  
    145145        size_t ssize = timestamp( stamp );
    146146
    147 #if NV_PLATFORM == NV_WINDOWS
     147#if NV_COMPILER == NV_MSVC
    148148        if ( m_color ) SetConsoleTextAttribute( m_handle, FOREGROUND_INTENSITY );
    149149        WriteConsole( m_handle, stamp, ssize, nullptr, nullptr );
    … …  
    170170        else
    171171                fwrite( "] ", 2, 1, stdout );
    172         fwrite( stamp.data(), stamp.size(), 1, stdout );
     172        fwrite( message.data(), message.size(), 1, stdout );
    173173        fwrite( "\n", 1, 1, stdout );
    174174#endif
    … …  
    233233        : m_color( coloring )
    234234{
    235 #if NV_PLATFORM == NV_WINDOWS
     235#if NV_COMPILER == NV_MSVC
    236236        m_handle = GetStdHandle( STD_OUTPUT_HANDLE );
    237237#else
    … …  
    240240}
    241241
    242 size_t nv::log_sink::timestamp( char* buffer ) const
     242nv::size_t nv::log_sink::timestamp( char* buffer ) const
    243243{
    244244        uint32 ms = get_system_ms();
    … …  
    248248        unsigned int m    = (unsigned int)(secs / 60) % 60;
    249249        unsigned int s    = secs % 60;
    250 #if NV_PLATFORM == NV_WINDOWS
     250#if NV_COMPILER == NV_MSVC
    251251        sprintf_s( buffer, 16, "%02d:%02d:%02d.%02d", h, m, s, mm );
    252252#else

  • trunk/src/core/profiler.cc

    r371 r376  
    1212using namespace nv;
    1313
    14 #ifdef NV_MSVC
     14#if NV_COMPILER == NV_MSVC
    1515#define snprintf sprintf_s
    1616#endif

  • trunk/src/core/time.cc

    r319 r376  
    77#include "nv/core/logging.hh"
    88
     9#include <ctime>
     10
    911#if NV_COMPILER == NV_MSVC
    1012#define WIN32_LEAN_AND_MEAN
    … …  
    1315#pragma intrinsic(__rdtsc)
    1416#else
    15 #include <unistd.h>
     17#if NV_COMPILER == NV_GNUC && NV_PLATFORM == NV_WINDOWS
     18// mingw doesn't have usleep nor nanosleep...
     19#include <windows.h>
     20#endif
     21// #include <unistd.h>
     22// #include <time.h>
     23// #include <sys/time.h>
     24// #include <sys/types.h>
     25#include <stdio.h>
     26#include <time.h>
    1627#include <sys/time.h>
    1728#endif
    1829
    19 #include <ctime>
     30
    2031
    2132struct timer_impl
    … …  
    5869        Sleep( ms );
    5970#else
    60         usleep( ms * 1000 );
     71#if NV_COMPILER == NV_GNUC && NV_PLATFORM == NV_WINDOWS
     72        Sleep( ms );
     73#else
     74        struct timespec ts;
     75        ts.tv_sec = 0;
     76        ts.tv_nsec = ms * 1000000;
     77        nanosleep(&ts, NULL);
     78//      usleep( ms * 1000 );
     79#endif
    6180#endif
    6281}
Note: See TracChangeset for help on using the changeset viewer.