diff options
| author | Lioncash <mathew1800@gmail.com> | 2017-01-17 19:19:20 -0500 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2017-01-17 20:46:48 -0500 |
| commit | f1542c8e5a9f38e0c470cf04c8c10ae6175504d3 (patch) | |
| tree | 1d9c4282ec06ca5ceaaa4cb4f1c07e845af18dac /Source/Core/Common/Network.cpp | |
| parent | 63011f14024d000e915f8831829bbfa9d9852cb0 (diff) | |
Common: Namespace Network.h/.cpp
Necessary to avoid namespace clashes with IOS HLE's namespace name.
Diffstat (limited to 'Source/Core/Common/Network.cpp')
| -rw-r--r-- | Source/Core/Common/Network.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Source/Core/Common/Network.cpp b/Source/Core/Common/Network.cpp index ce61cefc59..f492efd5ae 100644 --- a/Source/Core/Common/Network.cpp +++ b/Source/Core/Common/Network.cpp @@ -11,6 +11,8 @@ #include "Common/StringUtil.h" #include "Common/Timer.h" +namespace Common +{ void GenerateMacAddress(const MACConsumer type, u8* mac) { memset(mac, 0, MAC_ADDRESS_SIZE); @@ -20,10 +22,10 @@ void GenerateMacAddress(const MACConsumer type, u8* mac) switch (type) { - case BBA: + case MACConsumer::BBA: memcpy(mac, oui_bba, 3); break; - case IOS: + case MACConsumer::IOS: memcpy(mac, oui_ios, 3); break; } @@ -68,3 +70,4 @@ bool StringToMacAddress(const std::string& mac_string, u8* mac) } return success; } +} // namespace Common |
