Clean up after the timedelta.h/units.h merge

[libs/core.git] / source / time / utils.cpp

diff --git a/source/time/utils.cpp b/source/time/utils.cpp
index b59a8af0ea944fdde78cf77d4ee5c38cf4b6aa15..9c643cf8b2dec5634c703474d5b3e976a58f3346 100644 (file)
--- a/source/time/utils.cpp
+++ b/source/time/utils.cpp
@@ -10,7 +10,6 @@
 #include "rawtime_private.h"
 #include "timedelta.h"
 #include "timestamp.h"
 #include "rawtime_private.h"
 #include "timedelta.h"
 #include "timestamp.h"

-#include "units.h"

 #include "utils.h"
 
 using namespace std;
 #include "utils.h"
 
 using namespace std;


@@ -23,28 +22,11 @@ TimeStamp now()
 #ifndef WIN32
        timeval tv;
        gettimeofday(&tv, 0);
 #ifndef WIN32
        timeval tv;
        gettimeofday(&tv, 0);

-       return TimeStamp(tv.tv_sec*1000000LL+tv.tv_usec);
+       return TimeStamp(timeval_to_rawtime(tv));

 #else
 #else

-       static RawTime epoch = 0;
-       if(!epoch)
-       {
-               SYSTEMTIME st;
-               st.wYear = 1970;
-               st.wMonth = 1;
-               st.wDay = 1;
-               st.wHour = 0;
-               st.wMinute = 0;
-               st.wSecond = 0;
-               st.wMilliseconds = 0;
-
-               FILETIME ft;
-               SystemTimeToFileTime(&st, &ft);
-               epoch = (ft.dwLowDateTime+(static_cast<RawTime>(ft.dwHighDateTime)<<32))/10;
-       }
-       

        FILETIME ft;
        GetSystemTimeAsFileTime(&ft);
        FILETIME ft;
        GetSystemTimeAsFileTime(&ft);

-       return TimeStamp((ft.dwLowDateTime+(static_cast<RawTime>(ft.dwHighDateTime)<<32))/10-epoch);
+       return TimeStamp(filetime_to_rawtime(ft));

 #endif
 }
 
 #endif
 }