X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Ftime%2Futils.cpp;fp=source%2Ftime%2Futils.cpp;h=c9cc94dd6ed4b2efa85b9f72f6c4fb6a7d94c2d7;hp=f4a5379d44fb0418414d479f800b17d9b97916fc;hb=cd89068b8ebafdc0f888c1aa21498bb93b55d814;hpb=06acf132d03decb4e3d7b9d95d727f49c7dff428 diff --git a/source/time/utils.cpp b/source/time/utils.cpp index f4a5379..c9cc94d 100644 --- a/source/time/utils.cpp +++ b/source/time/utils.cpp @@ -30,7 +30,7 @@ TimeStamp now() gettimeofday(&tv, 0); return TimeStamp(tv.tv_sec*1000000LL+tv.tv_usec); #else - static int64_t epoch=0; + static RawTime epoch=0; if(!epoch) { SYSTEMTIME st; @@ -44,12 +44,12 @@ TimeStamp now() FILETIME ft; SystemTimeToFileTime(&st, &ft); - epoch=(ft.dwLowDateTime+((int64_t)ft.dwHighDateTime<<32))/10; + epoch=(ft.dwLowDateTime+(static_cast(ft.dwHighDateTime)<<32))/10; } FILETIME ft; GetSystemTimeAsFileTime(&ft); - return TimeStamp((ft.dwLowDateTime+((int64_t)ft.dwHighDateTime<<32))/10-epoch); + return TimeStamp((ft.dwLowDateTime+(static_cast(ft.dwHighDateTime)<<32))/10-epoch); #endif }