commit 81fa02eeb854d41cc20a641d35a027665d2f6133
author William A. Kennington III <wak@google.com> Thu Oct 04 14:56:36 2018 -0700
committer William A. Kennington III <wak@google.com> Fri Oct 05 15:02:59 2018 -0700
tree 0d4ded08157780fd2e7aa0fada22e8ee849df1e1
parent b2cb9339f7d963d2b16b8dcf3af5313f996e4eb5

message: Fix variant api usage

This makes our use of the mapbox variant consistent with std::variant.
We need this cleanup for the conversion to std::variant.

Tested:
    Ran unit tests to make sure they still pass.

Change-Id: I990013eaaa2ec27f2fda71bfadd9a5369d50c187
Signed-off-by: William A. Kennington III <wak@google.com>

test/message/append.cpp

diff --git a/test/message/append.cpp b/test/message/append.cpp
index 76faeeb..12c0bf3 100644
--- a/test/message/append.cpp
+++ b/test/message/append.cpp
@@ -16,6 +16,7 @@
 namespace
 {
 
+namespace variant_ns = sdbusplus::message::variant_ns;
 using testing::Eq;
 using testing::MatcherCast;
 using testing::Pointee;
@@ -363,17 +364,18 @@
         {
             expect_open_container(SD_BUS_TYPE_DICT_ENTRY, "sv");
             expect_basic_string(SD_BUS_TYPE_STRING, sv.first.c_str());
-            if (sv.second.is<int>())
+            if (variant_ns::holds_alternative<int>(sv.second))
             {
                 expect_open_container(SD_BUS_TYPE_VARIANT, "i");
-                expect_basic<int>(SD_BUS_TYPE_INT32, sv.second.get<int>());
+                expect_basic<int>(SD_BUS_TYPE_INT32,
+                                  variant_ns::get<int>(sv.second));
                 expect_close_container();
             }
             else
             {
                 expect_open_container(SD_BUS_TYPE_VARIANT, "d");
                 expect_basic<double>(SD_BUS_TYPE_DOUBLE,
-                                     sv.second.get<double>());
+                                     variant_ns::get<double>(sv.second));
                 expect_close_container();
             }
             expect_close_container();

test/message/read.cpp

diff --git a/test/message/read.cpp b/test/message/read.cpp
index eeafd32..55808d8 100644
--- a/test/message/read.cpp
+++ b/test/message/read.cpp
@@ -17,6 +17,7 @@
 namespace
 {
 
+namespace variant_ns = sdbusplus::message::variant_ns;
 using testing::DoAll;
 using testing::Return;
 using testing::StrEq;
@@ -596,11 +597,12 @@
             expect_at_end(false, 0);
             expect_enter_container(SD_BUS_TYPE_DICT_ENTRY, "sv");
             expect_basic<const char*>(SD_BUS_TYPE_STRING, sv.first.c_str());
-            if (sv.second.is<int>())
+            if (variant_ns::holds_alternative<int>(sv.second))
             {
                 expect_verify_type(SD_BUS_TYPE_VARIANT, "i", true);
                 expect_enter_container(SD_BUS_TYPE_VARIANT, "i");
-                expect_basic<int>(SD_BUS_TYPE_INT32, sv.second.get<int>());
+                expect_basic<int>(SD_BUS_TYPE_INT32,
+                                  variant_ns::get<int>(sv.second));
                 expect_exit_container();
             }
             else
@@ -609,7 +611,7 @@
                 expect_verify_type(SD_BUS_TYPE_VARIANT, "d", true);
                 expect_enter_container(SD_BUS_TYPE_VARIANT, "d");
                 expect_basic<double>(SD_BUS_TYPE_DOUBLE,
-                                     sv.second.get<double>());
+                                     variant_ns::get<double>(sv.second));
                 expect_exit_container();
             }
             expect_exit_container();