doryan/BloomPatched
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tidying

Browse Source
This commit is contained in:
Nav
2022-06-18 16:02:01 +01:00
parent 634ab23368
commit 951c697ef6
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/TargetController/TargetControllerComponent.cpp
View File

@@ -261,7 +261,7 @@ namespace Bloom::TargetController
}); });
// Include all targets from AVR8 target description files // Include all targets from AVR8 target description files
auto avr8PdMapping = Avr8TargetDescriptionFile::getTargetDescriptionMapping(); const auto avr8PdMapping = Avr8TargetDescriptionFile::getTargetDescriptionMapping();
for (auto mapIt = avr8PdMapping.begin(); mapIt != avr8PdMapping.end(); mapIt++) { for (auto mapIt = avr8PdMapping.begin(); mapIt != avr8PdMapping.end(); mapIt++) {
// Each target signature maps to an array of targets, as numerous targets can possess the same signature. // Each target signature maps to an array of targets, as numerous targets can possess the same signature.
@@ -293,7 +293,7 @@ namespace Bloom::TargetController
auto commands = std::queue<std::unique_ptr<Command>>(); auto commands = std::queue<std::unique_ptr<Command>>();
{ {
auto queueLock = TargetControllerComponent::commandQueue.acquireLock(); const auto queueLock = TargetControllerComponent::commandQueue.acquireLock();
commands.swap(TargetControllerComponent::commandQueue.getValue()); commands.swap(TargetControllerComponent::commandQueue.getValue());
} }
@@ -337,7 +337,7 @@ namespace Bloom::TargetController
CommandIdType commandId, CommandIdType commandId,
std::unique_ptr<Response> response std::unique_ptr<Response> response
) { ) {
auto responseMappingLock = TargetControllerComponent::responsesByCommandId.acquireLock(); const auto responseMappingLock = TargetControllerComponent::responsesByCommandId.acquireLock();
TargetControllerComponent::responsesByCommandId.getValue().insert( TargetControllerComponent::responsesByCommandId.getValue().insert(
std::pair(commandId, std::move(response)) std::pair(commandId, std::move(response))
); );
@@ -588,7 +588,8 @@ namespace Bloom::TargetController
while (this->target->supportsPromotion()) { while (this->target->supportsPromotion()) {
auto promotedTarget = this->target->promote(); auto promotedTarget = this->target->promote();
if (promotedTarget == nullptr if (
promotedTarget == nullptr
|| std::type_index(typeid(*promotedTarget)) == std::type_index(typeid(*this->target)) || std::type_index(typeid(*promotedTarget)) == std::type_index(typeid(*this->target))
) { ) {
break; break;