From 1446ce94bf9d96596ed89b23ced889c08bcb8894 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 3 Feb 2021 16:31:03 +0100 Subject: [PATCH] small tweaks --- datapoollocal/LocalDataPoolManager.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/datapoollocal/LocalDataPoolManager.cpp b/datapoollocal/LocalDataPoolManager.cpp index 2c5c4e0e..c8d1e30d 100644 --- a/datapoollocal/LocalDataPoolManager.cpp +++ b/datapoollocal/LocalDataPoolManager.cpp @@ -848,7 +848,6 @@ MutexIF* LocalDataPoolManager::getLocalPoolMutex() { object_id_t LocalDataPoolManager::getCreatorObjectId() const { return owner->getObjectId(); - //return owner->getObjectId(); } void LocalDataPoolManager::printWarningOrError(sif::OutputTypes outputType, @@ -885,7 +884,7 @@ void LocalDataPoolManager::printWarningOrError(sif::OutputTypes outputType, if(outputType == sif::OutputTypes::OUT_WARNING) { #if FSFW_CPP_OSTREAM_ENABLED == 1 sif::warning << "LocalDataPoolManager::" << functionName - << ": Object ID " << std::setw(8) << std::setfill('0') + << ": Object ID 0x" << std::setw(8) << std::setfill('0') << std::hex << owner->getObjectId() << " | " << errorPrint << std::dec << std::setfill(' ') << std::endl; #else @@ -896,7 +895,7 @@ void LocalDataPoolManager::printWarningOrError(sif::OutputTypes outputType, else if(outputType == sif::OutputTypes::OUT_ERROR) { #if FSFW_CPP_OSTREAM_ENABLED == 1 sif::error << "LocalDataPoolManager::" << functionName - << ": Object ID " << std::setw(8) << std::setfill('0') + << ": Object ID 0x" << std::setw(8) << std::setfill('0') << std::hex << owner->getObjectId() << " | " << errorPrint << std::dec << std::setfill(' ') << std::endl; #else