From f442e119aed2dc87f320bf230ad39e7dc5c72524 Mon Sep 17 00:00:00 2001
From: Vernon Mauery <vernon.mauery@linux.intel.com>
Date: Tue, 9 Apr 2019 11:44:36 -0700
Subject: move variant to std namespace

sdbusplus::message::variant_ns has been std for a while now. This moves
ipmid away from sdbusplus::message::variant_ns to directly use
std::variant.

Tested-by: built, compiles, and runs the same as before.

Change-Id: I8caa945f31c926c2721319f001b9d7f83fd3f1b7
Signed-off-by: Vernon Mauery <vernon.mauery@linux.intel.com>
---
 selutility.cpp | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'selutility.cpp')

diff --git a/selutility.cpp b/selutility.cpp
index 97c2b2b..0d71a47 100644
--- a/selutility.cpp
+++ b/selutility.cpp
@@ -58,8 +58,7 @@ GetSELEntryResponse
         elog<InternalFailure>();
     }
 
-    record.recordID = static_cast<uint16_t>(
-        sdbusplus::message::variant_ns::get<uint32_t>(iterId->second));
+    record.recordID = static_cast<uint16_t>(std::get<uint32_t>(iterId->second));
 
     // Read Timestamp from the log entry.
     static constexpr auto propTimeStamp = "Timestamp";
@@ -71,7 +70,7 @@ GetSELEntryResponse
     }
 
     std::chrono::milliseconds chronoTimeStamp(
-        sdbusplus::message::variant_ns::get<uint64_t>(iterTimeStamp->second));
+        std::get<uint64_t>(iterTimeStamp->second));
     record.timeStamp = static_cast<uint32_t>(
         std::chrono::duration_cast<std::chrono::seconds>(chronoTimeStamp)
             .count());
@@ -100,7 +99,7 @@ GetSELEntryResponse
     static constexpr auto deassertEvent = 0x80;
 
     // Evaluate if the event is assertion or deassertion event
-    if (sdbusplus::message::variant_ns::get<bool>(iterResolved->second))
+    if (std::get<bool>(iterResolved->second))
     {
         record.eventType = deassertEvent | iter->second.eventReadingType;
     }
@@ -142,7 +141,7 @@ GetSELEntryResponse convertLogEntrytoSEL(const std::string& objPath)
     sdbusplus::message::variant<AssociationList> list;
     reply.read(list);
 
-    auto& assocs = sdbusplus::message::variant_ns::get<AssociationList>(list);
+    auto& assocs = std::get<AssociationList>(list);
 
     /*
      * Check if the log entry has any callout associations, if there is a
@@ -204,8 +203,7 @@ std::chrono::seconds getEntryTimeStamp(const std::string& objPath)
     sdbusplus::message::variant<uint64_t> timeStamp;
     reply.read(timeStamp);
 
-    std::chrono::milliseconds chronoTimeStamp(
-        sdbusplus::message::variant_ns::get<uint64_t>(timeStamp));
+    std::chrono::milliseconds chronoTimeStamp(std::get<uint64_t>(timeStamp));
 
     return std::chrono::duration_cast<std::chrono::seconds>(chronoTimeStamp);
 }
-- 
cgit v1.2.1