summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Barth <msbarth@us.ibm.com>2017-11-07 14:01:22 -0600
committerMatthew Barth <msbarth@us.ibm.com>2017-11-17 13:14:11 -0600
commit34a389e6964febe6a244711790e06961ce42e00c (patch)
tree4dea3307ee15b305a4aed95253c5dfd22a1e06d4
parent55dea64300f44adc5146da3764ab52d39b546518 (diff)
downloadphosphor-fan-presence-34a389e6964febe6a244711790e06961ce42e00c.tar.gz
phosphor-fan-presence-34a389e6964febe6a244711790e06961ce42e00c.zip
Use in place init of event data
Change-Id: Ia56acbeaa89423060e65e50eff8accffec5a4631 Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
-rw-r--r--control/actions.cpp11
-rw-r--r--control/zone.cpp14
2 files changed, 8 insertions, 17 deletions
diff --git a/control/actions.cpp b/control/actions.cpp
index 8ecd30c..b162602 100644
--- a/control/actions.cpp
+++ b/control/actions.cpp
@@ -35,13 +35,10 @@ Action call_actions_based_on_timer(Timer&& tConf, std::vector<Action>&& actions)
// Associate event data with timer
std::unique_ptr<EventData> eventData =
std::make_unique<EventData>(
- EventData
- {
- group,
- "",
- nullptr,
- actions
- }
+ group,
+ "",
+ nullptr,
+ actions
);
// Create/start timer and associate event data with it
std::unique_ptr<util::Timer> timer =
diff --git a/control/zone.cpp b/control/zone.cpp
index 784004e..7b2b31e 100644
--- a/control/zone.cpp
+++ b/control/zone.cpp
@@ -303,13 +303,10 @@ void Zone::initEvent(const SetSpeedEvent& event)
// Setup signal matches of the property for event
std::unique_ptr<EventData> eventData =
std::make_unique<EventData>(
- EventData
- {
std::get<groupPos>(event),
std::get<sigMatchPos>(sig),
std::get<sigHandlerPos>(sig),
std::get<actionsPos>(event)
- }
);
std::unique_ptr<sdbusplus::server::match::match> match = nullptr;
if (!std::get<sigMatchPos>(sig).empty())
@@ -332,13 +329,10 @@ void Zone::initEvent(const SetSpeedEvent& event)
// Associate event data with timer
std::unique_ptr<EventData> eventData =
std::make_unique<EventData>(
- EventData
- {
- std::get<groupPos>(event),
- "",
- nullptr,
- std::get<actionsPos>(event)
- }
+ std::get<groupPos>(event),
+ "",
+ nullptr,
+ std::get<actionsPos>(event)
);
std::unique_ptr<util::Timer> timer =
std::make_unique<util::Timer>(
OpenPOWER on IntegriCloud