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 +2 -3
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c756297e5c - Show all commits

5
src/fsfw/util/dataWrapper.h
View File

@ -36,9 +36,8 @@ struct DataWrapper {
}
[[nodiscard]] bool isNull() const {
if (type == DataTypes::RAW and dataUnion.raw.data == nullptr or
(type == DataTypes::SERIALIZABLE and dataUnion.serializable == nullptr) or
(type == DataTypes::NONE)) {
if ((type == DataTypes::NONE) or (type == DataTypes::RAW and dataUnion.raw.data == nullptr) or
(type == DataTypes::SERIALIZABLE and dataUnion.serializable == nullptr)) {
return true;
}
return false;