summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam A. Kennington III <wak@google.com>2018-11-06 16:46:01 -0800
committerRatan Gupta <ratagupt@linux.vnet.ibm.com>2018-11-21 09:14:07 +0000
commit79e4415fff20c0fb01d00b4f78d0de432d0e7e9a (patch)
tree7cbea4bd3cf46e408bc0acc1e4e53944853ec0fa
parent6d6699600baea9e6bd6e809c4a38ebec0ff2f091 (diff)
downloadphosphor-networkd-79e4415fff20c0fb01d00b4f78d0de432d0e7e9a.tar.gz
phosphor-networkd-79e4415fff20c0fb01d00b4f78d0de432d0e7e9a.zip
Fix std::variant usage
This cleans up the use of mapbox only .get() variant apis in favor of the std::get() interface which both implementations provide. Change-Id: I9ba8301801d68b391fa5195de37b2b0ecec26edf Signed-off-by: William A. Kennington III <wak@google.com>
-rw-r--r--system_configuration.cpp2
-rw-r--r--util.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/system_configuration.cpp b/system_configuration.cpp
index b9c0b2f..603fa15 100644
--- a/system_configuration.cpp
+++ b/system_configuration.cpp
@@ -85,7 +85,7 @@ std::string SystemConfiguration::getHostNameFromSystem() const
report<InternalFailure>();
return "";
}
- return name.get<std::string>();
+ return sdbusplus::message::variant_ns::get<std::string>(name);
}
std::string SystemConfiguration::defaultGateway(std::string gateway)
diff --git a/util.cpp b/util.cpp
index b66f908..28f064c 100644
--- a/util.cpp
+++ b/util.cpp
@@ -544,7 +544,7 @@ std::string getfromInventory(sdbusplus::bus::bus& bus)
}
reply.read(value);
- return value.get<std::string>();
+ return sdbusplus::message::variant_ns::get<std::string>(value);
}
} // namespace mac_address
OpenPOWER on IntegriCloud