commit 05eedaa80eef276b6ecee9d4fb721a523d2d999c
author Patrick Williams <patrick@stwcx.xyz> Wed May 13 17:58:42 2020 -0500
committer Patrick Williams <patrick@stwcx.xyz> Wed May 20 18:28:05 2020 +0000
tree 270b75b0415ea951f51e5066c0e4ddfa87b1d588
parent c80e6e22002eba3efaed6b25a60314582c71b5d5

sdbusplus: replace message::variant with std::variant

Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Ie60d8442edab9622240cf47840e0d62b8e57a5b4

nvme_manager.cpp

diff --git a/nvme_manager.cpp b/nvme_manager.cpp
index 023e20e..276eb2d 100644
--- a/nvme_manager.cpp
+++ b/nvme_manager.cpp
@@ -439,8 +439,7 @@
 
 void Nvme::createNVMeInventory()
 {
-    using Properties =
-        std::map<std::string, sdbusplus::message::variant<std::string, bool>>;
+    using Properties = std::map<std::string, std::variant<std::string, bool>>;
     using Interfaces = std::map<std::string, Properties>;
 
     std::string inventoryPath;

sdbusplus.hpp

diff --git a/sdbusplus.hpp b/sdbusplus.hpp
index f1722f4..6844dfa 100644
--- a/sdbusplus.hpp
+++ b/sdbusplus.hpp
@@ -25,7 +25,7 @@
                     const std::string& objPath, const std::string& interface,
                     const std::string& property, const T& value)
     {
-        sdbusplus::message::variant<T> data = value;
+        std::variant<T> data = value;
 
         try
         {
@@ -59,7 +59,7 @@
         methodCall.append(interface.c_str());
         methodCall.append(property);
 
-        sdbusplus::message::variant<Property> value;
+        std::variant<Property> value;
 
         try
         {