Merge pull request #5113

c0e9e805 Fixed missing return value in once_a_time class on windows (Markus Behm)
This commit is contained in:
Riccardo Spagni 2019-03-04 21:25:44 +02:00
commit 4a390d43f8
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD

View File

@ -243,6 +243,7 @@ namespace math_helper
present = present << 32; present = present << 32;
present |= fileTime.dwLowDateTime; present |= fileTime.dwLowDateTime;
present /= 10; // mic-sec present /= 10; // mic-sec
return present;
#else #else
struct timeval tv; struct timeval tv;
gettimeofday(&tv, NULL); gettimeofday(&tv, NULL);