From 34a389e6964febe6a244711790e06961ce42e00c Mon Sep 17 00:00:00 2001
From: Matthew Barth <msbarth@us.ibm.com>
Date: Tue, 7 Nov 2017 14:01:22 -0600
Subject: Use in place init of event data

Change-Id: Ia56acbeaa89423060e65e50eff8accffec5a4631
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
---
 control/actions.cpp | 11 ++++-------
 control/zone.cpp    | 14 ++++----------
 2 files changed, 8 insertions(+), 17 deletions(-)

(limited to 'control')

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>(
-- 
cgit v1.2.1