Merge branch 'develop' into mohr/merge-upstream

This commit is contained in:
Robin Müller 2022-09-15 18:34:37 +02:00
commit ef9ed95fd1

View File

@ -48,12 +48,12 @@ LocalPoolObjectBase::LocalPoolObjectBase(object_id_t poolOwner, lp_id_t poolId,
if (hkOwner == nullptr) { if (hkOwner == nullptr) {
#if FSFW_CPP_OSTREAM_ENABLED == 1 #if FSFW_CPP_OSTREAM_ENABLED == 1
sif::error << "LocalPoolVariable: The supplied pool owner 0x" << std::hex << poolOwner sif::error << "LocalPoolVariable: The supplied pool owner 0x" << std::hex << poolOwner
<< std::dec << " did not implement the correct interface " << std::dec << " does not exist or does not implement the correct interface "
<< "HasLocalDataPoolIF" << std::endl; << "HasLocalDataPoolIF" << std::endl;
#else #else
sif::printError( sif::printError(
"LocalPoolVariable: The supplied pool owner 0x%08x did not implement the correct " "LocalPoolVariable: The supplied pool owner 0x%08x does not exist or does not implement "
"interface HasLocalDataPoolIF\n", "the correct interface HasLocalDataPoolIF\n",
poolOwner); poolOwner);
#endif #endif
return; return;