diff options
| author | William A. Kennington III <wak@google.com> | 2018-11-19 17:45:35 -0800 |
|---|---|---|
| committer | Vernon Mauery <vernon.mauery@linux.intel.com> | 2018-11-26 16:41:57 +0000 |
| commit | dfad4863541f2315f02dd1c95cd7d4e8b688f697 (patch) | |
| tree | 2eec6fc030218a92e9ff1279898109eeda500e65 /user_channel/channel_mgmt.cpp | |
| parent | 9cc0ea5f245b215e9eea41b9861f704c6b305671 (diff) | |
| download | phosphor-host-ipmid-dfad4863541f2315f02dd1c95cd7d4e8b688f697.tar.gz phosphor-host-ipmid-dfad4863541f2315f02dd1c95cd7d4e8b688f697.zip | |
std::variant: Fix new instances of mapbox specific calls
Tested:
Build and run through unit tests.
Change-Id: I87f2d5441b2f029e1e96ee1b46c4c760b0d82aac
Signed-off-by: William A. Kennington III <wak@google.com>
Diffstat (limited to 'user_channel/channel_mgmt.cpp')
| -rw-r--r-- | user_channel/channel_mgmt.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/user_channel/channel_mgmt.cpp b/user_channel/channel_mgmt.cpp index fc2ca1b..14b350e 100644 --- a/user_channel/channel_mgmt.cpp +++ b/user_channel/channel_mgmt.cpp @@ -34,6 +34,7 @@ namespace ipmi { +namespace variant_ns = sdbusplus::message::variant_ns; using namespace phosphor::logging; static constexpr const char* channelAccessDefaultFilename = @@ -198,7 +199,7 @@ void processChAccessPropChange(ChannelConfig& chConfig, const std::string& path, if (prop.first == privilegePropertyString) { propName = privilegePropertyString; - intfPrivStr = prop.second.get<std::string>(); + intfPrivStr = variant_ns::get<std::string>(prop.second); break; } } @@ -1347,9 +1348,9 @@ int ChannelConfig::syncNetworkChannelConfig() entry("INTERFACE:%s", intfName.c_str())); continue; } - intfPrivStr = variant.get<std::string>(); + intfPrivStr = variant_ns::get<std::string>(variant); } - catch (const mapbox::util::bad_variant_access& e) + catch (const variant_ns::bad_variant_access& e) { log<level::DEBUG>( "exception: Network interface does not exist"); |
