commit 0748c69d287ca4d9c431f586431288c048dbe914
author Jason M. Bills <jason.m.bills@intel.com> Thu Sep 08 15:34:08 2022 -0700
committer Vernon Mauery <vernon.mauery@linux.intel.com> Tue Sep 27 19:18:56 2022 +0000
tree add92e580f6ee49a7d35ee063e09d23740d687fb
parent d42a0c459c077802dfc3b35676f0fdfa10d9615d

Condense std::variants

Where possible, reduce to a single std::variant type to reduce binary
size.

Change-Id: I73b59765109ce1ccd7339f0e214d1ec3929e1ffc
Signed-off-by: Jason M. Bills <jason.m.bills@intel.com>

src/bmccontrolservices.cpp

diff --git a/src/bmccontrolservices.cpp b/src/bmccontrolservices.cpp
index e30c4a9..484c426 100644
--- a/src/bmccontrolservices.cpp
+++ b/src/bmccontrolservices.cpp
@@ -20,6 +20,7 @@
 #include <ipmid/api.hpp>
 #include <ipmid/utils.hpp>
 #include <phosphor-logging/log.hpp>
+#include <types.hpp>
 
 #include <variant>
 
@@ -148,7 +149,7 @@
                             yield, ec, getServiceConfigMgrName().c_str(),
                             obj.first.str, dBusPropIntf, "Set",
                             serviceConfigAttrIntf, propMasked,
-                            std::variant<bool>(!state));
+                            ipmi::DbusVariant(!state));
                         checkAndThrowError(ec, "Set Masked property failed");
                         // Multiple instances may be present, so continue
                     }