Merge remote-tracking branch 'upstram/master' into mueller_localPoolNeat

2020-05-20 14:38:41 +02:00
parent c7856da81c 6dc05e4951
commit e576ddaa86
45 changed files with 229 additions and 148 deletions
--- a/subsystem/SubsystemBase.cpp
+++ b/subsystem/SubsystemBase.cpp
@ -88,7 +88,7 @@ void SubsystemBase::executeTable(HybridIterator<ModeListEntry> tableIter, Submod
 		object_id_t object = tableIter.value->getObject();
 		if ((iter = childrenMap.find(object)) == childrenMap.end()) {
 			//illegal table entry, should only happen due to misconfigured mode table
-			debug << std::hex << getObjectId() << ": invalid mode table entry"
+			sif::debug << std::hex << getObjectId() << ": invalid mode table entry"
 					<< std::endl;
 			continue;
 		}