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

Use _Pairib in VC versions below 14.2.

This commit is contained in:
Julio C. Rocha 2019-08-17 00:59:45 -07:00
parent 1ad1f71d2f
commit 05c2b59c3a
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Project64/UserInterface/Debugger/Breakpoints.cpp
View File

@ -64,7 +64,12 @@ bool CBreakpoints::WBPAdd(uint32_t address)
bool CBreakpoints::AddExecution(uint32_t address, bool bTemporary) bool CBreakpoints::AddExecution(uint32_t address, bool bTemporary)
{ {
PreUpdateBP(); PreUpdateBP();
#if _MSC_VER >= 1920 // Visual Studio 2019 deprecates _Pairib
auto res = m_Execution.insert(breakpoint_t::value_type(address, bTemporary)); auto res = m_Execution.insert(breakpoint_t::value_type(address, bTemporary));
#else
breakpoints_t::_Pairib res = m_Execution.insert(breakpoint_t::value_type(address, bTemporary));
#endif // _MSC_VER
if (!res.second && !bTemporary) if (!res.second && !bTemporary)
{ {
res.first->second = true; res.first->second = true;