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

2021-01-12 15:04:00 +01:00
parent cafc8e4ccb 25a86e91de
commit 3242264a77
20 changed files with 108 additions and 106 deletions
--- a/datapoollocal/HasLocalDataPoolIF.h
+++ b/datapoollocal/HasLocalDataPoolIF.h
@ -146,7 +146,7 @@ protected:
 	    sif::warning << "HasLocalDataPoolIF::getPoolObjectHandle: Not overriden"
 	            << ". Returning nullptr!" << std::endl;
 #else
-	    fsfw::printWarning("HasLocalDataPoolIF::getPoolObjectHandle: "
+	    sif::printWarning("HasLocalDataPoolIF::getPoolObjectHandle: "
 	    		"Not overriden. Returning nullptr!\n");
 #endif
 	    return nullptr;