From 5b92d5076a0be89945fa0fc722749dd5fbfcdf4c Mon Sep 17 00:00:00 2001 From: Lioncash Date: Fri, 14 Jun 2019 10:53:46 -0400 Subject: Common: Use fmt where applicable Begins the transition to using fmt for string formatting where applicable. Given fmt supports formatting std::string instances out of the box, we can remove now-unnecessary calls to .c_str() and .data(). Note that this change does not touch the actual logging subsystem aside from converting the final StringFromFormat call in the process over to fmt::format. Given our logging system is heavily used throughout the entire codebase, and converting that over will be quite a large change by itself, this will be tackled near the end of the conversion process. --- Source/Core/Common/Network.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'Source/Core/Common/Network.cpp') diff --git a/Source/Core/Common/Network.cpp b/Source/Core/Common/Network.cpp index acfb60e55c..77d835a126 100644 --- a/Source/Core/Common/Network.cpp +++ b/Source/Core/Common/Network.cpp @@ -9,8 +9,9 @@ #include #include +#include + #include "Common/Random.h" -#include "Common/StringUtil.h" namespace Common { @@ -38,8 +39,8 @@ MACAddress GenerateMacAddress(const MACConsumer type) std::string MacAddressToString(const MACAddress& mac) { - return StringFromFormat("%02x:%02x:%02x:%02x:%02x:%02x", mac[0], mac[1], mac[2], mac[3], mac[4], - mac[5]); + return fmt::format("{:02x}:{:02x}:{:02x}:{:02x}:{:02x}:{:02x}", mac[0], mac[1], mac[2], mac[3], + mac[4], mac[5]); } std::optional StringToMacAddress(const std::string& mac_string) -- cgit v1.2.3