diff --git a/Source/Core/Common/PcapFile.cpp b/Source/Core/Common/PcapFile.cpp index 5ce626f279..0d9ce9a5a3 100644 --- a/Source/Core/Common/PcapFile.cpp +++ b/Source/Core/Common/PcapFile.cpp @@ -8,6 +8,8 @@ #include "Common/File.h" #include "Common/PcapFile.h" +namespace Common +{ namespace { const u32 PCAP_MAGIC = 0xa1b2c3d4; @@ -61,3 +63,4 @@ void PCAP::AddPacket(const u8* bytes, size_t size) m_fp->WriteBytes(&rec_hdr, sizeof(rec_hdr)); m_fp->WriteBytes(bytes, size); } +} // namespace Common diff --git a/Source/Core/Common/PcapFile.h b/Source/Core/Common/PcapFile.h index 4e33b25802..e01c06bb11 100644 --- a/Source/Core/Common/PcapFile.h +++ b/Source/Core/Common/PcapFile.h @@ -19,6 +19,8 @@ #include "Common/CommonTypes.h" #include "Common/File.h" +namespace Common +{ class PCAP final { public: @@ -38,3 +40,4 @@ private: std::unique_ptr m_fp; }; +} // namespace Common diff --git a/Source/Core/Core/DSP/DSPCaptureLogger.cpp b/Source/Core/Core/DSP/DSPCaptureLogger.cpp index f3206505f6..2703d6b3cc 100644 --- a/Source/Core/Core/DSP/DSPCaptureLogger.cpp +++ b/Source/Core/Core/DSP/DSPCaptureLogger.cpp @@ -40,15 +40,16 @@ struct DMAPacket #pragma pack(pop) PCAPDSPCaptureLogger::PCAPDSPCaptureLogger(const std::string& pcap_filename) - : m_pcap(new PCAP(new File::IOFile(pcap_filename, "wb"))) + : m_pcap(new Common::PCAP(new File::IOFile(pcap_filename, "wb"))) { } -PCAPDSPCaptureLogger::PCAPDSPCaptureLogger(PCAP* pcap) : m_pcap(pcap) +PCAPDSPCaptureLogger::PCAPDSPCaptureLogger(Common::PCAP* pcap) : m_pcap(pcap) { } -PCAPDSPCaptureLogger::PCAPDSPCaptureLogger(std::unique_ptr&& pcap) : m_pcap(std::move(pcap)) +PCAPDSPCaptureLogger::PCAPDSPCaptureLogger(std::unique_ptr&& pcap) + : m_pcap(std::move(pcap)) { } diff --git a/Source/Core/Core/DSP/DSPCaptureLogger.h b/Source/Core/Core/DSP/DSPCaptureLogger.h index 07ac068349..14869ffde1 100644 --- a/Source/Core/Core/DSP/DSPCaptureLogger.h +++ b/Source/Core/Core/DSP/DSPCaptureLogger.h @@ -9,7 +9,10 @@ #include "Common/CommonTypes.h" +namespace Common +{ class PCAP; +} namespace DSP { @@ -56,8 +59,8 @@ public: // Automatically creates a writeable file (truncate existing file). PCAPDSPCaptureLogger(const std::string& pcap_filename); // Takes ownership of pcap. - PCAPDSPCaptureLogger(PCAP* pcap); - PCAPDSPCaptureLogger(std::unique_ptr&& pcap); + PCAPDSPCaptureLogger(Common::PCAP* pcap); + PCAPDSPCaptureLogger(std::unique_ptr&& pcap); void LogIFXRead(u16 address, u16 read_value) override { LogIFXAccess(true, address, read_value); } void LogIFXWrite(u16 address, u16 written_value) override @@ -69,6 +72,6 @@ public: private: void LogIFXAccess(bool read, u16 address, u16 value); - std::unique_ptr m_pcap; + std::unique_ptr m_pcap; }; } // namespace DSP