From 66b22ecab1c3532eb1cae13da7156660f2545ab0 Mon Sep 17 00:00:00 2001 From: zilmar Date: Mon, 28 Nov 2016 07:28:13 +1100 Subject: [PATCH] [Project64] Fix some usage of friend --- Source/Project64-core/N64System/Mips/MemoryVirtualMem.h | 6 +++--- Source/Project64-core/N64System/Mips/TLBClass.h | 2 +- Source/Project64-core/N64System/Recompiler/Arm/ArmOps.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/Project64-core/N64System/Mips/MemoryVirtualMem.h b/Source/Project64-core/N64System/Mips/MemoryVirtualMem.h index b462b1d59..9c8127574 100644 --- a/Source/Project64-core/N64System/Mips/MemoryVirtualMem.h +++ b/Source/Project64-core/N64System/Mips/MemoryVirtualMem.h @@ -117,10 +117,10 @@ private: CMipsMemoryVM& operator=(const CMipsMemoryVM&); // Disable assignment #if defined(__i386__) || defined(_M_IX86) - friend CX86RecompilerOps; + friend class CX86RecompilerOps; #elif defined(__arm__) || defined(_M_ARM) - friend CArmRegInfo; - friend CArmRecompilerOps; + friend class CArmRegInfo; + friend class CArmRecompilerOps; #endif static void RdramChanged(CMipsMemoryVM * _this); diff --git a/Source/Project64-core/N64System/Mips/TLBClass.h b/Source/Project64-core/N64System/Mips/TLBClass.h index d1a4f6f97..63b63efb4 100644 --- a/Source/Project64-core/N64System/Mips/TLBClass.h +++ b/Source/Project64-core/N64System/Mips/TLBClass.h @@ -134,7 +134,7 @@ private: bool Probed; }; - friend CDebugTlb; // enable debug window to read class + friend class CDebugTlb; // enable debug window to read class CTLB_CB * const m_CB; diff --git a/Source/Project64-core/N64System/Recompiler/Arm/ArmOps.h b/Source/Project64-core/N64System/Recompiler/Arm/ArmOps.h index 1f97c658d..a337b45a0 100644 --- a/Source/Project64-core/N64System/Recompiler/Arm/ArmOps.h +++ b/Source/Project64-core/N64System/Recompiler/Arm/ArmOps.h @@ -219,7 +219,7 @@ protected: static const char * ArmRegName(ArmReg Reg); private: - friend CArmRegInfo; + friend class CArmRegInfo; static void PreOpCheck(bool AllowedInItBlock, const char * FileName, uint32_t LineNumber); static void BreakPointNotification(const char * FileName, uint32_t LineNumber);