diff options
| author | Riccardo Spagni <ric@spagni.net> | 2019-03-04 21:25:44 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2019-03-04 21:25:44 +0200 |
| commit | 4a390d43f8f7bdd73b7c219a9234ad4177f34604 (patch) | |
| tree | 15664f217909843d3aff2eed9b77e4637093e536 | |
| parent | Merge pull request #5112 (diff) | |
| parent | Fixed missing return value in once_a_time class on windows (diff) | |
| download | monero-4a390d43f8f7bdd73b7c219a9234ad4177f34604.tar.xz | |
Merge pull request #5113
c0e9e805 Fixed missing return value in once_a_time class on windows (Markus Behm)
| -rw-r--r-- | contrib/epee/include/math_helper.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/contrib/epee/include/math_helper.h b/contrib/epee/include/math_helper.h index e22e8ee6e..35b649972 100644 --- a/contrib/epee/include/math_helper.h +++ b/contrib/epee/include/math_helper.h @@ -243,6 +243,7 @@ namespace math_helper present = present << 32; present |= fileTime.dwLowDateTime; present /= 10; // mic-sec + return present; #else struct timeval tv; gettimeofday(&tv, NULL); |