eive/fsfw
eive/fsfw
15
1
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases 1 Wiki Activity

Update FSFW from upstream #71

Closed
muellerr wants to merge 1112 commits from development into eive/develop
pull from: development
merge into: eive:eive/develop
Conversation 0 Commits 1112 Files Changed 1041 +1 -4
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a9c6c088f2 - Show all commits

5
src/fsfw/globalfunctions/timevalOperations.cpp
View File

@ -1,12 +1,9 @@
#include "fsfw/globalfunctions/timevalOperations.h"
#include <cstdio>
timeval& operator+=(timeval& lhs, const timeval& rhs) {
int64_t sum = static_cast<int64_t>(lhs.tv_sec) * 1000000. + lhs.tv_usec;
sum += static_cast<int64_t>(rhs.tv_sec) * 1000000. + rhs.tv_usec;
int64_t tmp = sum / 1000000;
lhs.tv_sec = tmp;
lhs.tv_sec = sum / 1000000;
lhs.tv_usec = sum - lhs.tv_sec * 1000000;
return lhs;
}