From ca9e2508370362c6964aa7df92351fd833c04494 Mon Sep 17 00:00:00 2001
From: "Jake.Stine" <Jake.Stine@96395faa-99c1-11dd-bbfe-3dabce05a288>
Date: Mon, 18 Oct 2010 16:09:00 +0000
Subject: [PATCH] wxIsoFile: And a couple more compiler fixes.

git-svn-id: http://pcsx2.googlecode.com/svn/branches/wxIsoFile@3942 96395faa-99c1-11dd-bbfe-3dabce05a288
---
 common/include/Utilities/Dependencies.h    | 6 +++++-
 common/include/Utilities/Exceptions.h      | 4 ++--
 common/include/Utilities/FixedPointTypes.h | 1 -
 common/include/Utilities/ScopedAlloc.h     | 8 +++++---
 common/include/Utilities/StringHelpers.h   | 3 ---
 pcsx2/PrecompiledHeader.h                  | 2 --
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/common/include/Utilities/Dependencies.h b/common/include/Utilities/Dependencies.h
index 5683751d4c..98b3e7e8a9 100644
--- a/common/include/Utilities/Dependencies.h
+++ b/common/include/Utilities/Dependencies.h
@@ -185,6 +185,9 @@ extern const wxChar* __fastcall pxExpandMsg( const wxChar* key, const wxChar* en
 extern const wxChar* __fastcall pxGetTranslation( const wxChar* message );
 extern bool pxIsEnglish( int id );
 
+extern wxString fromUTF8( const char* src );
+extern wxString fromAscii( const char* src );
+
 // --------------------------------------------------------------------------------------
 //  wxLt(x)   [macro]
 // --------------------------------------------------------------------------------------
@@ -230,6 +233,7 @@ extern bool pxIsEnglish( int id );
 
 #define pxE(key, english)			pxExpandMsg( wxT(key),						english )
 
+#include "Utilities/Assertions.h"
+#include "Utilities/Exceptions.h"
 #include "Utilities/ScopedPtr.h"
 #include "Utilities/ScopedAlloc.h"
-#include "Utilities/Assertions.h"
diff --git a/common/include/Utilities/Exceptions.h b/common/include/Utilities/Exceptions.h
index b1e3557705..ca73656774 100644
--- a/common/include/Utilities/Exceptions.h
+++ b/common/include/Utilities/Exceptions.h
@@ -15,8 +15,8 @@
 
 #pragma once
 
-#include "Dependencies.h"
-#include "StringHelpers.h"
+#include "Assertions.h"
+#include "ScopedPtr.h"
 
 // --------------------------------------------------------------------------------------
 //  DESTRUCTOR_CATCHALL - safe destructor helper
diff --git a/common/include/Utilities/FixedPointTypes.h b/common/include/Utilities/FixedPointTypes.h
index 71c4519112..58f2eb6e1b 100644
--- a/common/include/Utilities/FixedPointTypes.h
+++ b/common/include/Utilities/FixedPointTypes.h
@@ -16,7 +16,6 @@
 #pragma once
 
 #include "Dependencies.h"
-#include "Exceptions.h"
 
 template< int Precision >
 struct FixedInt
diff --git a/common/include/Utilities/ScopedAlloc.h b/common/include/Utilities/ScopedAlloc.h
index a6350f4204..60751fafc3 100644
--- a/common/include/Utilities/ScopedAlloc.h
+++ b/common/include/Utilities/ScopedAlloc.h
@@ -15,6 +15,8 @@
 
 #pragma once
 
+#include "Exceptions.h"
+
 // pxUSE_SECURE_MALLOC - enables bounds checking on scoped malloc allocations.
 
 #ifndef pxUSE_SECURE_MALLOC
@@ -142,7 +144,7 @@ template< typename T >
 class ScopedAlloc : public BaseScopedAlloc<T>
 {
 public:
-	ScopedAlloc( size_t size=0 ) : BaseScopedAlloc()
+	ScopedAlloc( size_t size=0 ) : BaseScopedAlloc<T>()
 	{
 		Alloc(size);
 	}
@@ -156,9 +158,9 @@ public:
 	{
 		safe_free(this->m_buffer);
 		this->m_size = newsize;
-		if (!m_size) return;
+		if (!this->m_size) return;
 
-		this->m_buffer = (T*)malloc( m_size * sizeof(T) );
+		this->m_buffer = (T*)malloc( this->m_size * sizeof(T) );
 		if (!this->m_buffer)
 			throw Exception::OutOfMemory("ScopedAlloc");
 	}
diff --git a/common/include/Utilities/StringHelpers.h b/common/include/Utilities/StringHelpers.h
index 9b41976a99..1c40692991 100644
--- a/common/include/Utilities/StringHelpers.h
+++ b/common/include/Utilities/StringHelpers.h
@@ -64,9 +64,6 @@ public:
 
 extern void px_fputs( FILE* fp, const char* src );
 
-extern wxString fromUTF8( const char* src );
-extern wxString fromAscii( const char* src );
-
 // wxWidgets lacks one of its own...
 extern const wxRect wxDefaultRect;
 
diff --git a/pcsx2/PrecompiledHeader.h b/pcsx2/PrecompiledHeader.h
index 600039b406..c8bdcffc83 100644
--- a/pcsx2/PrecompiledHeader.h
+++ b/pcsx2/PrecompiledHeader.h
@@ -88,13 +88,11 @@ typedef int BOOL;
 #include "Pcsx2Defs.h"
 #include "i18n.h"
 
-#include "Utilities/Assertions.h"
 #include "Utilities/FixedPointTypes.h"
 #include "Utilities/wxBaseTools.h"
 #include "Utilities/ScopedPtr.h"
 #include "Utilities/Path.h"
 #include "Utilities/Console.h"
-#include "Utilities/Exceptions.h"
 #include "Utilities/MemcpyFast.h"
 #include "Utilities/General.h"
 #include "x86emitter/tools.h"