mohr/fsfw
1
0
Fork 0
forked from fsfw/fsfw
Code Pull Requests Activity

Merge remote-tracking branch 'upstream/mueller/master' into mueller/master

Browse Source
This commit is contained in:
Robin Müller
2021-01-12 15:04:00 +01:00
parent cafc8e4ccb 25a86e91de
commit 3242264a77
20 changed files with 108 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
datapoollocal/LocalPoolObjectBase.cpp
View File

@ -118,7 +118,7 @@ void LocalPoolObjectBase::reportReadCommitError(const char* variableType,
<< std::hex << std::setw(8) << std::setfill('0') << objectId << std::dec
<< " LPID: " << lpId << std::endl;
#else
fsfw::printWarning("%s: %s call | %s | Owner: 0x%08x LPID: %lu\n",
sif::printWarning("%s: %s call | %s | Owner: 0x%08x LPID: %lu\n",
variableType, type, errMsg, objectId, lpId);
#endif /* FSFW_CPP_OSTREAM_ENABLED == 1 */
#endif /* FSFW_DISABLE_PRINTOUT == 0 */