commit 6467ed247f5f809a53914a045da972e3b18429ca
author Andrew Geissler <geissonator@yahoo.com> Sat May 16 16:03:53 2020 -0500
committer Andrew Geissler <geissonator@yahoo.com> Mon May 18 12:16:17 2020 -0500
tree 1462f4d7be3e33ae72757beef9b3ad609daf98a2
parent 59c82d9b68ebefaef342032430b69ed6bc09e0f0

ensure proper data types for variants

New upstream yocto compiler is failing due to different data types on
the variants. Make it explicit.

Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: Ifb81121695d9fe72d6a7fc7b363dec7507e7f4dd

sensordatahandler.hpp

diff --git a/sensordatahandler.hpp b/sensordatahandler.hpp
index 99c3ae9..f74eeb5 100644
--- a/sensordatahandler.hpp
+++ b/sensordatahandler.hpp
@@ -275,8 +275,8 @@
     for (const auto& property : interface->second)
     {
         msg.append(property.first);
-        std::variant<T> value =
-            (cmdData.assertOffset8_14 << 8) | cmdData.assertOffset0_7;
+        std::variant<T> value = static_cast<T>((cmdData.assertOffset8_14 << 8) |
+                                               cmdData.assertOffset0_7);
         msg.append(value);
     }
     return updateToDbus(msg);

storagehandler.cpp

diff --git a/storagehandler.cpp b/storagehandler.cpp
index 905d0b7..e4b43dd 100644
--- a/storagehandler.cpp
+++ b/storagehandler.cpp
@@ -539,7 +539,7 @@
     {
         sdbusplus::bus::bus bus{ipmid_get_sd_bus_connection()};
         auto service = ipmi::getService(bus, TIME_INTERFACE, HOST_TIME_PATH);
-        std::variant<uint64_t> value{usec.count()};
+        std::variant<uint64_t> value{(uint64_t)usec.count()};
 
         // Set host time
         auto method = bus.new_method_call(service.c_str(), HOST_TIME_PATH,