mirror of https://github.com/PCSX2/pcsx2.git
pcsx2: gcc 4.7 compilation fix
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5132 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
parent
79b9c1cb87
commit
9264b7725c
|
@ -602,8 +602,8 @@ public:
|
|||
HashMap( const Key& emptyKey, const Key& deletedKey, int initialCapacity=33 ) :
|
||||
google::dense_hash_map<Key, T, HashFunctor>( initialCapacity )
|
||||
{
|
||||
set_empty_key( emptyKey );
|
||||
set_deleted_key( deletedKey );
|
||||
this->set_empty_key( emptyKey );
|
||||
this->set_deleted_key( deletedKey );
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
@ -616,7 +616,7 @@ public:
|
|||
/// </remarks>
|
||||
bool TryGetValue( const Key& key, T& outval ) const
|
||||
{
|
||||
const_iterator iter( find(key) );
|
||||
const_iterator iter( this->find(key) );
|
||||
if( iter != end() )
|
||||
{
|
||||
outval = iter->second;
|
||||
|
|
|
@ -22,6 +22,7 @@
|
|||
#include <sys/mman.h>
|
||||
#include <signal.h>
|
||||
#include <errno.h>
|
||||
#include <unistd.h>
|
||||
|
||||
extern void SignalExit(int sig);
|
||||
|
||||
|
|
|
@ -17,6 +17,7 @@
|
|||
|
||||
#include <ctype.h>
|
||||
#include <time.h>
|
||||
#include <unistd.h>
|
||||
#include <sys/time.h>
|
||||
#include <wx/utils.h>
|
||||
|
||||
|
|
|
@ -17,6 +17,7 @@
|
|||
#include "../PrecompiledHeader.h"
|
||||
#include "PersistentThread.h"
|
||||
#include <sys/prctl.h>
|
||||
#include <unistd.h>
|
||||
|
||||
// We wont need this until we actually have this more then just stubbed out, so I'm commenting this out
|
||||
// to remove an unneeded dependency.
|
||||
|
|
|
@ -74,6 +74,7 @@ void vmfree(void* ptr, size_t size)
|
|||
#else
|
||||
|
||||
#include <sys/mman.h>
|
||||
#include <unistd.h>
|
||||
|
||||
void* vmalloc(size_t size, bool code)
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue