ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use standard allocator for pxEventList/wxEventList 

wxWidgets3.0 does not have the WXObjectAllocator anymore, so remove it.
This commit is contained in:
Jonathan Li 2015-06-08 03:46:28 +01:00
parent 93168069db
commit b6375686ff
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/include/Utilities/wxAppWithHelpers.h
View File

@ -58,11 +58,7 @@ public:
virtual void OnActionButtonClicked( wxCommandEvent& evt ); virtual void OnActionButtonClicked( wxCommandEvent& evt );
}; };
#ifdef _MSC_VER typedef std::list< wxEvent* > wxEventList;
typedef std::list< wxEvent*, WXObjectAllocator(wxEvent*) > wxEventList;
#else
typedef std::list< wxEvent* > wxEventList;
#endif
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
// wxAppWithHelpers // wxAppWithHelpers

6
pcsx2/gui/pxEventThread.h
View File

@ -171,11 +171,7 @@ protected:
} }
}; };
#ifdef _MSC_VER typedef std::list<SysExecEvent*> pxEvtList;
typedef std::list< SysExecEvent*, WXObjectAllocator(SysExecEvent*) > pxEvtList;
#else
typedef std::list<SysExecEvent*> pxEvtList;
#endif
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
// pxEvtQueue // pxEvtQueue