From 534fa65ecf1d22299eac2874a779ed1c03ef3a4b Mon Sep 17 00:00:00 2001
From: refraction <refraction@gmail.com>
Date: Fri, 15 May 2015 20:21:24 +0100
Subject: [PATCH] Fix for VS2013 microVU debug logging

---
 pcsx2/x86/microVU_Log.inl    | 4 ++++
 pcsx2/x86/microVU_Profiler.h | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pcsx2/x86/microVU_Log.inl b/pcsx2/x86/microVU_Log.inl
index 93295b6533..3f193114ce 100644
--- a/pcsx2/x86/microVU_Log.inl
+++ b/pcsx2/x86/microVU_Log.inl
@@ -99,6 +99,10 @@ void __mVUdumpProgram(microVU& mVU, microProgram& prog) {
 			mVUlog(")");
 		}
 
+		if (mVUstall) {
+			mVUlog(" Stall %d Cycles", mVUstall);
+		}
+
 		iPC = i;
 		mVU.code = prog.data[i];
 
diff --git a/pcsx2/x86/microVU_Profiler.h b/pcsx2/x86/microVU_Profiler.h
index 0930bbc2a1..c080e79f12 100644
--- a/pcsx2/x86/microVU_Profiler.h
+++ b/pcsx2/x86/microVU_Profiler.h
@@ -113,10 +113,10 @@ struct microProfiler {
 		progCount++;
 		if ((progCount % progLimit) == 0) {
 			u64 total = 0;
-			vector< pair<u32, u32> > v;
+			std::vector< std::pair<u32, u32> > v;
 			for(int i = 0; i < opLastOpcode; i++) {
 				total += opStats[i];
-				v.push_back(make_pair(opStats[i], i));
+				v.push_back(std::make_pair(opStats[i], i));
 			}
 			std::sort   (v.begin(), v.end());
 			std::reverse(v.begin(), v.end());
@@ -125,7 +125,7 @@ struct microProfiler {
 			for(u32 i = 0; i < v.size(); i++) {
 				u64    count = v[i].first;
 				double stat  = (double)count / dTotal * 100.0;
-				string str   = microOpcodeName[v[i].second];
+				std::string str = microOpcodeName[v[i].second];
 				str.resize(8, ' ');
 				DevCon.WriteLn("%s - [%3.4f%%][count=%u]",
 					str.c_str(), stat, (u32)count);