diff options
| -rw-r--r-- | src/NDSCart.cpp | 4 | ||||
| -rw-r--r-- | src/WifiAP.cpp | 4 | ||||
| -rw-r--r-- | src/WifiAP.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/NDSCart.cpp b/src/NDSCart.cpp index df729bd..4c6efdd 100644 --- a/src/NDSCart.cpp +++ b/src/NDSCart.cpp @@ -1741,8 +1741,6 @@ std::unique_ptr<CartCommon> ParseROM(const u8* romdata, u32 romlen) return cart; } -// Why a move function? Because the Cart object is polymorphic, -// and cloning polymorphic objects without knowing the underlying type is annoying. bool InsertROM(std::unique_ptr<CartCommon>&& cart) { if (!cart) { @@ -1753,6 +1751,8 @@ bool InsertROM(std::unique_ptr<CartCommon>&& cart) if (Cart) EjectCart(); + // Why a move function? Because the Cart object is polymorphic, + // and cloning polymorphic objects without knowing the underlying type is annoying. Cart = std::move(cart); Cart->Reset(); diff --git a/src/WifiAP.cpp b/src/WifiAP.cpp index 9107a81..50100c5 100644 --- a/src/WifiAP.cpp +++ b/src/WifiAP.cpp @@ -68,7 +68,7 @@ bool MACEqual(u8* a, const u8* b); bool MACIsBroadcast(u8* a); -WifiAP::WifiAP(class Wifi* wifi) : Wifi(wifi) +WifiAP::WifiAP(Wifi* client) : Client(client) { } @@ -368,7 +368,7 @@ int WifiAP::RecvPacket(u8* data) // check destination MAC if (!MACIsBroadcast(&LANBuffer[0])) { - if (!MACEqual(&LANBuffer[0], Wifi->GetMAC())) + if (!MACEqual(&LANBuffer[0], Client->GetMAC())) return 0; } diff --git a/src/WifiAP.h b/src/WifiAP.h index 717e1c6..34f71e7 100644 --- a/src/WifiAP.h +++ b/src/WifiAP.h @@ -26,7 +26,7 @@ class Wifi; class WifiAP { public: - WifiAP(Wifi* wifi); + WifiAP(Wifi* client); ~WifiAP(); void Reset(); @@ -40,7 +40,7 @@ public: int RecvPacket(u8* data); private: - class Wifi* Wifi; + Wifi* Client; u64 USCounter; |