libretro/Play-
1
0
Fork 0
mirror of https://github.com/libretro/Play-.git synced 2025-02-26 06:25:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove tr1 usage.

Browse Source
This commit is contained in:
Jean-Philip Desjardins 2017-12-13 13:28:21 -05:00
parent 331cf44917
commit 7989cc6f15
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/ui_win32/IconMesh.h
View File

@ -33,6 +33,6 @@ private:
FrameInfluenceArray m_frameInfluences;
};
typedef std::tr1::shared_ptr<CIconMesh> IconMeshPtr;
typedef std::shared_ptr<CIconMesh> IconMeshPtr;
#endif

4
Source/ui_win32/MemoryCardView.cpp
View File

@ -263,7 +263,7 @@ CMemoryCardView::CRender::CRender(HWND hWnd, const CViewState* pViewState)
, m_threadOver(false)
, m_thread(NULL)
{
m_thread = new std::thread(std::tr1::bind(&CRender::ThreadProc, this));
m_thread = new std::thread(std::bind(&CRender::ThreadProc, this));
}
CMemoryCardView::CRender::~CRender()
@ -302,7 +302,7 @@ void CMemoryCardView::CRender::ThreadProc()
void CMemoryCardView::CRender::SetMemoryCard(const CMemoryCard* memoryCard)
{
m_mailBox.SendCall(std::tr1::bind(&CRender::ThreadSetMemoryCard, this, memoryCard));
m_mailBox.SendCall(std::bind(&CRender::ThreadSetMemoryCard, this, memoryCard));
}
void CMemoryCardView::CRender::ThreadSetMemoryCard(const CMemoryCard* memoryCard)

6
Source/ui_win32/SaveIconView.cpp
View File

@ -62,7 +62,7 @@ CSaveIconView::CSaveIconView(HWND hParent, const RECT& rect)
Create(WS_EX_STATICEDGE, CLSNAME, _T(""), WS_VISIBLE | WS_CLIPCHILDREN | WS_CHILD, rect, hParent, NULL);
SetClassPtr();
m_thread = new std::thread(std::tr1::bind(&CSaveIconView::ThreadProc, this));
m_thread = new std::thread(std::bind(&CSaveIconView::ThreadProc, this));
}
CSaveIconView::~CSaveIconView()
@ -74,12 +74,12 @@ CSaveIconView::~CSaveIconView()
void CSaveIconView::SetSave(const CSave* save)
{
m_mailBox.SendCall(std::tr1::bind(&CSaveIconView::ThreadSetSave, this, save));
m_mailBox.SendCall(std::bind(&CSaveIconView::ThreadSetSave, this, save));
}
void CSaveIconView::SetIconType(CSave::ICONTYPE iconType)
{
m_mailBox.SendCall(std::tr1::bind(&CSaveIconView::ThreadSetIconType, this, iconType));
m_mailBox.SendCall(std::bind(&CSaveIconView::ThreadSetIconType, this, iconType));
}
void CSaveIconView::ThreadProc()

12
Source/ui_win32/SaveView.cpp
View File

@ -49,12 +49,12 @@ CSaveView::CSaveView(HWND hParent)
m_pDeletingIcon = new Framework::Win32::CButton(_T("Deleting Icon"), m_hWnd, rc, BS_PUSHLIKE | BS_CHECKBOX);
m_pIconViewWnd = new CSaveIconView(m_hWnd, rc);
m_CommandSink.RegisterCallback(m_pOpenFolder->m_hWnd, std::tr1::bind(&CSaveView::OpenSaveFolder, this));
m_CommandSink.RegisterCallback(m_pNormalIcon->m_hWnd, std::tr1::bind(&CSaveView::SetIconType, this, CSave::ICON_NORMAL));
m_CommandSink.RegisterCallback(m_pCopyingIcon->m_hWnd, std::tr1::bind(&CSaveView::SetIconType, this, CSave::ICON_COPYING));
m_CommandSink.RegisterCallback(m_pDeletingIcon->m_hWnd, std::tr1::bind(&CSaveView::SetIconType, this, CSave::ICON_DELETING));
m_CommandSink.RegisterCallback(m_pExport->m_hWnd, std::tr1::bind(&CSaveView::Export, this));
m_CommandSink.RegisterCallback(m_pDelete->m_hWnd, std::tr1::bind(&CSaveView::Delete, this));
m_CommandSink.RegisterCallback(m_pOpenFolder->m_hWnd, std::bind(&CSaveView::OpenSaveFolder, this));
m_CommandSink.RegisterCallback(m_pNormalIcon->m_hWnd, std::bind(&CSaveView::SetIconType, this, CSave::ICON_NORMAL));
m_CommandSink.RegisterCallback(m_pCopyingIcon->m_hWnd, std::bind(&CSaveView::SetIconType, this, CSave::ICON_COPYING));
m_CommandSink.RegisterCallback(m_pDeletingIcon->m_hWnd, std::bind(&CSaveView::SetIconType, this, CSave::ICON_DELETING));
m_CommandSink.RegisterCallback(m_pExport->m_hWnd, std::bind(&CSaveView::Export, this));
m_CommandSink.RegisterCallback(m_pDelete->m_hWnd, std::bind(&CSaveView::Delete, this));
Framework::FlatLayoutPtr pSubLayout0 = Framework::CHorizontalLayout::Create();
{