Linux: Fix some of the standard issue compiler errors that come with any changes. :)

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1836 96395faa-99c1-11dd-bbfe-3dabce05a288

common/include/Utilities/HashMap.h

@@ -550,8 +550,13 @@ template< class Key, class T >
 class HashMap : public google::dense_hash_map<Key, T, CommonHashClass>
 {
 public:
-	using dense_hash_map<Key, T, CommonHashClass>::operator[];
-	using dense_hash_map<Key, T, CommonHashClass>::const_iterator;
+#ifndef _MSC_VER
+	typedef typename google::dense_hash_map<Key, T, CommonHashClass> __super;
+#endif
+
+	using __super::operator[];
+	using __super::end;
+	typedef typename __super::const_iterator const_iterator;
 
 	virtual ~HashMap() {}
 
@@ -579,8 +584,7 @@ public:
 	/// </remarks>
 	void TryGetValue( const Key& key, T& outval ) const
 	{
-		// See above class for notes on why this is commented out.
-		const_iterator iter = find( key );
+		const_iterator iter( find(key) );
 		if( iter != end() )
 			outval = iter->second;
 	}

pcsx2/MTGS.cpp

@@ -198,7 +198,7 @@ void mtgsThreadObject::Start()
 		throw Exception::PluginOpenError( PluginId_GS );
 }
 
-mtgsThreadObject::~mtgsThreadObject()
+mtgsThreadObject::~mtgsThreadObject() throw()
 {
 	mtgsThreadObject::Cancel();
 }

pcsx2/System.cpp

@@ -93,7 +93,7 @@ void SysDetect()
 	JoinString( result[0], features[0], L".. " );
 	JoinString( result[1], features[1], L".. " );
 
-	WriteLn( L"Features Detected:\n\t" + result[0] + (result[1].IsEmpty() ? wxEmptyString : (L"\n\t" + result[1])) + L"\n" );
+	WriteLn( L"Features Detected:\n\t" + result[0] + (result[1].IsEmpty() ? L"" : (L"\n\t" + result[1])) + L"\n" );
 
 	//if ( x86caps.VendorName[0] == 'A' ) //AMD cpu
 

pcsx2/gui/App.h

@@ -394,7 +394,7 @@ protected:
 
 public:
 	AppEmuThread( PluginManager& plugins );
-	virtual ~AppEmuThread() { }
+	virtual ~AppEmuThread() throw() { }
 
 	virtual void Resume();
 	virtual void StateCheck();

pcsx2/gui/Dialogs/ConfigurationDialog.cpp

@@ -109,7 +109,7 @@ Dialogs::ConfigurationDialog::ConfigurationDialog( wxWindow* parent, int id ) :
 	ConnectSomethingChanged( DIRPICKER_CHANGED );
 }
 
-Dialogs::ConfigurationDialog::~ConfigurationDialog()
+Dialogs::ConfigurationDialog::~ConfigurationDialog() throw()
 {
 	g_ApplyState.DoCleanup();
 }

pcsx2/gui/Dialogs/ConfigurationDialog.h

@@ -32,7 +32,7 @@ namespace Dialogs
 		wxArrayString	m_labels;
 
 	public:
-		virtual ~ConfigurationDialog();
+		virtual ~ConfigurationDialog() throw();
 		ConfigurationDialog(wxWindow* parent=NULL, int id=DialogId_CoreSettings);
 
 	protected:
@@ -59,7 +59,7 @@ namespace Dialogs
 	protected:
 
 	public:
-		virtual ~BiosSelectorDialog() {}
+		virtual ~BiosSelectorDialog()  throw() {}
 		BiosSelectorDialog( wxWindow* parent=NULL, int id=DialogId_BiosSelector );
 
 	protected:

pcsx2/gui/wxHelpers.cpp

@@ -301,7 +301,7 @@ wxDialogWithHelpers::wxDialogWithHelpers( wxWindow* parent, int id,  const wxStr
 	// any good.
 }
 
-wxDialogWithHelpers::~wxDialogWithHelpers()
+wxDialogWithHelpers::~wxDialogWithHelpers() throw()
 {
 	--m_DialogIdents[GetId()];
 	wxASSERT( m_DialogIdents[GetId()] >= 0 );

plugins/spu2-x/src/Mixer.cpp

@@ -45,14 +45,17 @@ static const s32 tbl_XA_Factor[5][2] =
 //   caller to  extend the inputs so that they make use of all 32 bits of
 //   precision.
 //
-__forceinline s32 MulShr32( s32 srcval, s32 mulval )
+#ifdef MSC_VER
+__forceinline		// gcc can't inline this function, presumably because of it's exceeding complexity?
+#endif
+s32 MulShr32( s32 srcval, s32 mulval )
 {
 	s64 tmp = ((s64)srcval * mulval );
-	return ((s32*)&tmp)[1];
 
 	// Performance note: Using the temp var and memory reference
 	// actually ends up being roughly 2x faster than using a bitshift.
 	// It won't fly on big endian machines though... :)
+	return ((s32*)&tmp)[1];
 }
 
 __forceinline s32 clamp_mix( s32 x, u8 bitshift )
@@ -60,7 +63,10 @@ __forceinline s32 clamp_mix( s32 x, u8 bitshift )
 	return GetClamped( x, -0x8000<<bitshift, 0x7fff<<bitshift );
 }
 
-__forceinline StereoOut32 clamp_mix( const StereoOut32& sample, u8 bitshift )
+#if _MSC_VER
+__forceinline		// gcc forceinline fails here... ?
+#endif
+StereoOut32 clamp_mix( const StereoOut32& sample, u8 bitshift )
 {
 	return StereoOut32(
 		GetClamped( sample.Left, -0x8000<<bitshift, 0x7fff<<bitshift ),