piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 06:39:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Common: Namespace Network.h/.cpp

Browse Source 
Necessary to avoid namespace clashes with IOS HLE's namespace name.
This commit is contained in:
Lioncash
2017-01-17 19:19:20 -05:00
parent 63011f1402
commit f1542c8e5a
5 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/Common/Network.cpp
View File

@ -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

9
Source/Core/Common/Network.h
View File

@ -8,10 +8,12 @@
#include "Common/CommonTypes.h"
enum MACConsumer
namespace Common
{
BBA = 0,
IOS = 1
enum class MACConsumer
{
BBA,
IOS
};
enum
@ -22,3 +24,4 @@ enum
void GenerateMacAddress(const MACConsumer type, u8* mac);
std::string MacAddressToString(const u8* mac);
bool StringToMacAddress(const std::string& mac_string, u8* mac);
} // namespace Common