summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorJames Feist <james.feist@linux.intel.com>2019-02-08 13:51:43 -0800
committerJames Feist <james.feist@linux.intel.com>2019-02-08 13:51:43 -0800
commit1f802f5e9086f3771a8b1d50c5af4a77be56cee0 (patch)
tree08e05a8eb9c9f9e467d21df800bcfe9866c6b81b /test
parenta510ea2b5a2bba96cc5b2bdc4541b2f68b8cf299 (diff)
downloadphosphor-pid-control-1f802f5e9086f3771a8b1d50c5af4a77be56cee0.tar.gz
phosphor-pid-control-1f802f5e9086f3771a8b1d50c5af4a77be56cee0.zip
Move all variant usage to std
This just a style change, remove variant_ns in favor of std. Tested-by: it built Change-Id: Id5a075e8b73a7724cbc5153fb7dfcf369e79c483 Signed-off-by: James Feist <james.feist@linux.intel.com>
Diffstat (limited to 'test')
-rw-r--r--test/dbus_passive_unittest.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/test/dbus_passive_unittest.cpp b/test/dbus_passive_unittest.cpp
index 52126cf..81238a5 100644
--- a/test/dbus_passive_unittest.cpp
+++ b/test/dbus_passive_unittest.cpp
@@ -3,6 +3,7 @@
#include <sdbusplus/test/sdbus_mock.hpp>
#include <string>
+#include <variant>
#include <gmock/gmock.h>
#include <gtest/gtest.h>
@@ -138,7 +139,7 @@ TEST_F(DbusPassiveTestObj, VerifyHandlesDbusSignal)
const char* Value = "Value";
int64_t xValue = 10000;
const char* intf = "xyz.openbmc_project.Sensor.Value";
- // string, std::map<std::string, sdbusplus::message::variant<int64_t>>
+ // string, std::map<std::string, std::variant<int64_t>>
// msg.read(msgSensor, msgData);
EXPECT_CALL(sdbus_mock, sd_bus_message_read_basic(IsNull(), 's', NotNull()))
@@ -208,7 +209,7 @@ TEST_F(DbusPassiveTestObj, VerifyIgnoresOtherPropertySignal)
const char* Scale = "Scale";
int64_t xScale = -6;
const char* intf = "xyz.openbmc_project.Sensor.Value";
- // string, std::map<std::string, sdbusplus::message::variant<int64_t>>
+ // string, std::map<std::string, std::variant<int64_t>>
// msg.read(msgSensor, msgData);
EXPECT_CALL(sdbus_mock, sd_bus_message_read_basic(IsNull(), 's', NotNull()))
OpenPOWER on IntegriCloud