diff options
author | William A. Kennington III <wak@google.com> | 2018-11-06 16:06:34 -0800 |
---|---|---|
committer | William A. Kennington III <wak@google.com> | 2018-11-06 16:06:40 -0800 |
commit | 1f1d8e012f9ed003d2aa338537161a0205631776 (patch) | |
tree | eec552e792f7d8d8d1ea1176c95db819d314742f | |
parent | ab4cc6a5585436a29b120429abaa48b416f8edb7 (diff) | |
download | phosphor-time-manager-1f1d8e012f9ed003d2aa338537161a0205631776.tar.gz phosphor-time-manager-1f1d8e012f9ed003d2aa338537161a0205631776.zip |
Fix std::variant usage
We need to conform to the std::variant interface instead of the mapbox
specific one.
Change-Id: I3edbcb2682ddfebfcbca6e75284b11f2e18cfd11
Signed-off-by: William A. Kennington III <wak@google.com>
-rw-r--r-- | manager.cpp | 8 | ||||
-rw-r--r-- | utils.hpp | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/manager.cpp b/manager.cpp index 6d6c659..f9de91d 100644 --- a/manager.cpp +++ b/manager.cpp @@ -136,7 +136,9 @@ int Manager::onSettingsChanged(sdbusplus::message::message& msg) for (const auto& p : properties) { - onPropertyChanged(p.first, p.second.get<std::string>()); + onPropertyChanged( + p.first, + sdbusplus::message::variant_ns::get<std::string>(p.second)); } return 0; @@ -213,8 +215,8 @@ void Manager::onHostStateChanged(sdbusplus::message::message& msg) { if (p.first == HOST_CURRENT_STATE) { - auto state = - Host::convertHostStateFromString(p.second.get<std::string>()); + auto state = Host::convertHostStateFromString( + sdbusplus::message::variant_ns::get<std::string>(p.second)); onHostState(state == Host::HostState::Running); break; } @@ -70,7 +70,7 @@ T getProperty(sdbusplus::bus::bus& bus, const char* service, const char* path, sdbusplus::message::variant<T> value{}; auto reply = bus.call(method); reply.read(value); - return value.template get<T>(); + return sdbusplus::message::variant_ns::get<T>(value); } catch (const sdbusplus::exception::SdBusError& ex) { |