From f98211bfcf3473b7e57b108e0515c17bbdc58ba0 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Tue, 21 Mar 2017 13:45:18 -0400
Subject: [PATCH] JitBase: Make MergeAllowedNextInstructions a const member
 function

---
 Source/Core/Core/PowerPC/JitCommon/JitBase.cpp | 2 +-
 Source/Core/Core/PowerPC/JitCommon/JitBase.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/Core/Core/PowerPC/JitCommon/JitBase.cpp b/Source/Core/Core/PowerPC/JitCommon/JitBase.cpp
index 9b0c837610..c00724795c 100644
--- a/Source/Core/Core/PowerPC/JitCommon/JitBase.cpp
+++ b/Source/Core/Core/PowerPC/JitCommon/JitBase.cpp
@@ -27,7 +27,7 @@ JitBase::JitBase() = default;
 
 JitBase::~JitBase() = default;
 
-bool JitBase::MergeAllowedNextInstructions(int count)
+bool JitBase::MergeAllowedNextInstructions(int count) const
 {
   if (CPU::GetState() == CPU::CPU_STEPPING || js.instructionsLeft < count)
     return false;
diff --git a/Source/Core/Core/PowerPC/JitCommon/JitBase.h b/Source/Core/Core/PowerPC/JitCommon/JitBase.h
index f62776d6c3..0bd2044be5 100644
--- a/Source/Core/Core/PowerPC/JitCommon/JitBase.h
+++ b/Source/Core/Core/PowerPC/JitCommon/JitBase.h
@@ -104,7 +104,7 @@ protected:
   PPCAnalyst::CodeBlock code_block;
   PPCAnalyst::PPCAnalyzer analyzer;
 
-  bool MergeAllowedNextInstructions(int count);
+  bool MergeAllowedNextInstructions(int count) const;
 
   void UpdateMemoryOptions();