diff --git a/Source/Core/Common/Network.cpp b/Source/Core/Common/Network.cpp index 77d835a126..a928e8e831 100644 --- a/Source/Core/Common/Network.cpp +++ b/Source/Core/Common/Network.cpp @@ -6,8 +6,6 @@ #include #include -#include -#include #include @@ -43,10 +41,10 @@ std::string MacAddressToString(const MACAddress& mac) mac[4], mac[5]); } -std::optional StringToMacAddress(const std::string& mac_string) +std::optional StringToMacAddress(std::string_view mac_string) { if (mac_string.empty()) - return {}; + return std::nullopt; int x = 0; MACAddress mac{}; @@ -70,7 +68,7 @@ std::optional StringToMacAddress(const std::string& mac_string) // nibble is a character in the MAC address, making 12 characters // in total. if (x / 2 != MAC_ADDRESS_SIZE) - return {}; + return std::nullopt; return std::make_optional(mac); } diff --git a/Source/Core/Common/Network.h b/Source/Core/Common/Network.h index 3f3c343fe8..18a2f887e9 100644 --- a/Source/Core/Common/Network.h +++ b/Source/Core/Common/Network.h @@ -7,6 +7,7 @@ #include #include #include +#include #include "Common/CommonTypes.h" @@ -27,5 +28,5 @@ using MACAddress = std::array; MACAddress GenerateMacAddress(MACConsumer type); std::string MacAddressToString(const MACAddress& mac); -std::optional StringToMacAddress(const std::string& mac_string); +std::optional StringToMacAddress(std::string_view mac_string); } // namespace Common