From 05c2b59c3a5f130cf5eccc37a18cdd0a2cb4c105 Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Sat, 17 Aug 2019 00:59:45 -0700 Subject: [PATCH] Use _Pairib in VC versions below 14.2. --- Source/Project64/UserInterface/Debugger/Breakpoints.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Source/Project64/UserInterface/Debugger/Breakpoints.cpp b/Source/Project64/UserInterface/Debugger/Breakpoints.cpp index 165f74426..86c367b19 100644 --- a/Source/Project64/UserInterface/Debugger/Breakpoints.cpp +++ b/Source/Project64/UserInterface/Debugger/Breakpoints.cpp @@ -64,7 +64,12 @@ bool CBreakpoints::WBPAdd(uint32_t address) bool CBreakpoints::AddExecution(uint32_t address, bool bTemporary) { PreUpdateBP(); +#if _MSC_VER >= 1920 // Visual Studio 2019 deprecates _Pairib 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) { res.first->second = true;