Skip to content

Commit 4476dcd

Browse files
committed
Format ROOT blackboard conflict check
1 parent 7752a97 commit 4476dcd

1 file changed

Lines changed: 10 additions & 10 deletions

File tree

src/loggers/groot2_publisher.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -551,8 +551,8 @@ void Groot2Publisher::heartbeatLoop()
551551
}
552552
}
553553

554-
Expected<std::vector<uint8_t>> Groot2Publisher::generateBlackboardsDump(
555-
const std::string& bb_list)
554+
Expected<std::vector<uint8_t>>
555+
Groot2Publisher::generateBlackboardsDump(const std::string& bb_list)
556556
{
557557
auto json = nlohmann::json();
558558
const Blackboard* exported_root = nullptr;
@@ -575,9 +575,9 @@ Expected<std::vector<uint8_t>> Groot2Publisher::generateBlackboardsDump(
575575
if(bb_name == kRootBlackboardName &&
576576
(needs_exported_root || exported_root != nullptr))
577577
{
578-
return nonstd::make_unexpected(
579-
"blackboard dump request uses reserved name [ROOT] together with an "
580-
"external root blackboard export");
578+
return nonstd::make_unexpected("blackboard dump request uses reserved "
579+
"name [ROOT] together with an "
580+
"external root blackboard export");
581581
}
582582

583583
json[bb_name] = ExportBlackboardToJSON(*local_bb);
@@ -590,14 +590,14 @@ Expected<std::vector<uint8_t>> Groot2Publisher::generateBlackboardsDump(
590590
}
591591
if(exported_root != nullptr)
592592
{
593-
return nonstd::make_unexpected(
594-
"blackboard dump request spans multiple external root blackboards");
593+
return nonstd::make_unexpected("blackboard dump request spans "
594+
"multiple external root blackboards");
595595
}
596596
if(json.contains(kRootBlackboardName))
597597
{
598-
return nonstd::make_unexpected(
599-
"blackboard dump request would overwrite subtree [ROOT] with an "
600-
"external root blackboard export");
598+
return nonstd::make_unexpected("blackboard dump request would "
599+
"overwrite subtree [ROOT] with an "
600+
"external root blackboard export");
601601
}
602602
json[kRootBlackboardName] = ExportBlackboardToJSON(*root_bb);
603603
exported_root = root_bb;

0 commit comments

Comments
 (0)