mirror of https://github.com/PCSX2/pcsx2.git
Fix Linux compilation. (Possibly Windows as well...)
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3267 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
parent
a5208c4227
commit
d1818a3400
|
@ -5,6 +5,8 @@
|
|||
#include <google/dense_hash_map>
|
||||
#include <google/sparsehash/densehashtable.h>
|
||||
|
||||
#include <wx/string.h>
|
||||
|
||||
namespace HashTools {
|
||||
|
||||
#define HashFriend(Key,T) friend class HashMap<Key,T>
|
||||
|
@ -658,7 +660,7 @@ public:
|
|||
virtual ~pxDictionary() {}
|
||||
|
||||
pxDictionary( int initialCapacity=33, const wxString& emptyKey = L"@@-EMPTY-@@", const wxString& deletedKey = L"@@-DELETED-@@" )
|
||||
: HashMap<wxString, T>( emptyKey, deletedKey, initialCapacity)
|
||||
: HashTools::HashMap<wxString, T>( emptyKey, deletedKey, initialCapacity)
|
||||
{
|
||||
}
|
||||
};
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -15,7 +15,7 @@
|
|||
|
||||
#include "PrecompiledHeader.h"
|
||||
#include "Common.h"
|
||||
#include "HostGui.h"
|
||||
#include "IopCommon.h"
|
||||
|
||||
#include "System/PageFaultSource.h"
|
||||
#include "Utilities/EventSource.inl"
|
||||
|
|
|
@ -19,6 +19,7 @@
|
|||
|
||||
#include <wx/zipstrm.h>
|
||||
#include <wx/wfstream.h>
|
||||
#include <wx/imaglist.h>
|
||||
|
||||
#include "Resources/EmbeddedImage.h"
|
||||
#include "Resources/BackgroundLogo.h"
|
||||
|
|
|
@ -18,7 +18,6 @@
|
|||
#include "Utilities/RedtapeWindows.h" // our "safe" include of windows (sets version and undefs uselessness)
|
||||
|
||||
#include "System.h"
|
||||
#include "HostGui.h"
|
||||
#include "resource.h"
|
||||
|
||||
#define COMPILEDATE __DATE__
|
||||
|
|
Loading…
Reference in New Issue