From 5dfe7ffc471cbf1cccfa4d5f4aba40c19069b607 Mon Sep 17 00:00:00 2001
From: Gregory Hainaut <gregory.hainaut@gmail.com>
Date: Mon, 23 Nov 2015 07:33:36 +0100
Subject: [PATCH] core: prepare the conversion to the new emitter naming

---
 pcsx2/x86/iCore.cpp                   | 2 ++
 pcsx2/x86/iR5900Misc.cpp              | 1 +
 pcsx2/x86/ix86-32/iCore-32.cpp        | 1 +
 pcsx2/x86/ix86-32/iR5900AritImm.cpp   | 2 ++
 pcsx2/x86/ix86-32/iR5900Branch.cpp    | 2 +-
 pcsx2/x86/ix86-32/iR5900Move.cpp      | 1 +
 pcsx2/x86/ix86-32/iR5900MultDiv.cpp   | 2 ++
 pcsx2/x86/ix86-32/iR5900Shift.cpp     | 1 +
 pcsx2/x86/ix86-32/iR5900Templates.cpp | 2 ++
 pcsx2/x86/sVU_Micro.cpp               | 2 ++
 pcsx2/x86/sVU_Upper.cpp               | 3 +++
 11 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/pcsx2/x86/iCore.cpp b/pcsx2/x86/iCore.cpp
index 14c98d04e8..6230c6fa4d 100644
--- a/pcsx2/x86/iCore.cpp
+++ b/pcsx2/x86/iCore.cpp
@@ -22,6 +22,8 @@
 #include "VU.h"
 #include "R3000A.h"
 
+using namespace x86Emitter;
+
 __tls_emit u8  *j8Ptr[32];
 __tls_emit u32 *j32Ptr[32];
 
diff --git a/pcsx2/x86/iR5900Misc.cpp b/pcsx2/x86/iR5900Misc.cpp
index 337c2b246c..e59bd8b5cb 100644
--- a/pcsx2/x86/iR5900Misc.cpp
+++ b/pcsx2/x86/iR5900Misc.cpp
@@ -19,6 +19,7 @@
 #include "iR5900.h"
 #include "R5900OpcodeTables.h"
 
+using namespace x86Emitter;
 
 namespace R5900 {
 namespace Dynarec {
diff --git a/pcsx2/x86/ix86-32/iCore-32.cpp b/pcsx2/x86/ix86-32/iCore-32.cpp
index e8eaa98a7c..876bb8ddcb 100644
--- a/pcsx2/x86/ix86-32/iCore-32.cpp
+++ b/pcsx2/x86/ix86-32/iCore-32.cpp
@@ -22,6 +22,7 @@
 #include "x86emitter/x86emitter.h"
 #include "R3000A.h"
 
+using namespace x86Emitter;
 
 // yay sloppy crap needed until we can remove dependency on this hippopotamic
 // landmass of shared code. (air)
diff --git a/pcsx2/x86/ix86-32/iR5900AritImm.cpp b/pcsx2/x86/ix86-32/iR5900AritImm.cpp
index 0d988670db..1ee74adb5a 100644
--- a/pcsx2/x86/ix86-32/iR5900AritImm.cpp
+++ b/pcsx2/x86/ix86-32/iR5900AritImm.cpp
@@ -20,6 +20,8 @@
 #include "R5900OpcodeTables.h"
 #include "iR5900.h"
 
+using namespace x86Emitter;
+
 namespace R5900 {
 namespace Dynarec {
 namespace OpcodeImpl
diff --git a/pcsx2/x86/ix86-32/iR5900Branch.cpp b/pcsx2/x86/ix86-32/iR5900Branch.cpp
index 341ac94ad7..29334275b2 100644
--- a/pcsx2/x86/ix86-32/iR5900Branch.cpp
+++ b/pcsx2/x86/ix86-32/iR5900Branch.cpp
@@ -22,7 +22,7 @@
 #include "R5900OpcodeTables.h"
 #include "iR5900.h"
 
-namespace Interp = R5900::Interpreter::OpcodeImpl;
+using namespace x86Emitter;
 
 namespace R5900 {
 namespace Dynarec {
diff --git a/pcsx2/x86/ix86-32/iR5900Move.cpp b/pcsx2/x86/ix86-32/iR5900Move.cpp
index da022a11db..4404d56498 100644
--- a/pcsx2/x86/ix86-32/iR5900Move.cpp
+++ b/pcsx2/x86/ix86-32/iR5900Move.cpp
@@ -20,6 +20,7 @@
 #include "R5900OpcodeTables.h"
 #include "iR5900.h"
 
+using namespace x86Emitter;
 
 namespace R5900 {
 namespace Dynarec {
diff --git a/pcsx2/x86/ix86-32/iR5900MultDiv.cpp b/pcsx2/x86/ix86-32/iR5900MultDiv.cpp
index 6d24e85dbf..778ca0f301 100644
--- a/pcsx2/x86/ix86-32/iR5900MultDiv.cpp
+++ b/pcsx2/x86/ix86-32/iR5900MultDiv.cpp
@@ -20,6 +20,8 @@
 #include "R5900OpcodeTables.h"
 #include "iR5900.h"
 
+using namespace x86Emitter;
+
 namespace Interp = R5900::Interpreter::OpcodeImpl;
 
 namespace R5900 {
diff --git a/pcsx2/x86/ix86-32/iR5900Shift.cpp b/pcsx2/x86/ix86-32/iR5900Shift.cpp
index 54830ca0a2..f3ff460812 100644
--- a/pcsx2/x86/ix86-32/iR5900Shift.cpp
+++ b/pcsx2/x86/ix86-32/iR5900Shift.cpp
@@ -20,6 +20,7 @@
 #include "R5900OpcodeTables.h"
 #include "iR5900.h"
 
+using namespace x86Emitter;
 
 namespace R5900 {
 namespace Dynarec {
diff --git a/pcsx2/x86/ix86-32/iR5900Templates.cpp b/pcsx2/x86/ix86-32/iR5900Templates.cpp
index 1d4ab4afce..6e90bfd238 100644
--- a/pcsx2/x86/ix86-32/iR5900Templates.cpp
+++ b/pcsx2/x86/ix86-32/iR5900Templates.cpp
@@ -32,6 +32,8 @@
 
 #include "vtlb.h"
 
+using namespace x86Emitter;
+
 ////////////////////
 // Code Templates //
 ////////////////////
diff --git a/pcsx2/x86/sVU_Micro.cpp b/pcsx2/x86/sVU_Micro.cpp
index f0ecbb037b..130d4837ef 100644
--- a/pcsx2/x86/sVU_Micro.cpp
+++ b/pcsx2/x86/sVU_Micro.cpp
@@ -28,6 +28,8 @@
 #include "sVU_Debug.h"
 #include "sVU_zerorec.h"
 
+using namespace x86Emitter;
+
 #ifdef _WIN32
 #pragma warning(disable:4244)
 #pragma warning(disable:4761)
diff --git a/pcsx2/x86/sVU_Upper.cpp b/pcsx2/x86/sVU_Upper.cpp
index 45875cea69..a1733ae602 100644
--- a/pcsx2/x86/sVU_Upper.cpp
+++ b/pcsx2/x86/sVU_Upper.cpp
@@ -27,6 +27,9 @@
 #include "sVU_Micro.h"
 #include "sVU_Debug.h"
 #include "sVU_zerorec.h"
+
+using namespace x86Emitter;
+
 //------------------------------------------------------------------
 #define MINMAXFIX 1
 //------------------------------------------------------------------