Skip to content

Commit

Permalink
sys_status.cpp: Use move semantics to try to bypass the copy construc…
Browse files Browse the repository at this point in the history
…tor that the mutex disallows

Use "explicit" to make is simpler to construct an object
  • Loading branch information
amilcarlucas committed Feb 18, 2022
1 parent 5066cf8 commit 4cf4f02
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions mavros/src/plugins/sys_status.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ class SystemStatusDiag : public diagnostic_updater::DiagnosticTask
class BatteryStatusDiag : public diagnostic_updater::DiagnosticTask
{
public:
BatteryStatusDiag(const std::string &name) :
explicit BatteryStatusDiag(const std::string &name) :
diagnostic_updater::DiagnosticTask(name),
added(false),
voltage(-1.0f),
Expand Down Expand Up @@ -452,9 +452,9 @@ class SystemStatusPlugin : public plugin::PluginBase
has_battery_status0(false)
{
batt_diag.reserve(MAX_NR_BATTERY_STATUS);
batt_diag.emplace_back(BatteryStatusDiag("Battery"));
batt_diag.emplace_back(std::move(BatteryStatusDiag("Battery")));
for (int i = 2; i <= MAX_NR_BATTERY_STATUS ; ++i) {
batt_diag.emplace_back(BatteryStatusDiag(utils::format("Battery %u", i)));
batt_diag.emplace_back(std::move(BatteryStatusDiag(utils::format("Battery %u", i))));
}
}

Expand Down

0 comments on commit 4cf4f02

Please sign in to comment.