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

Remove _Pairib usage

This commit is contained in:
zilmar 2023-02-13 08:55:56 +10:30
parent 92c06c1651
commit 4390a0926c
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,11 +54,7 @@ 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
std::pair<breakpoints_t::iterator, bool> res = m_Execution.insert(breakpoint_t::value_type(address, bTemporary));
if (!res.second && !bTemporary)
{

4
Source/SortRdb/main.cpp
View File

@ -245,13 +245,13 @@ int main (int argc, char *argv[])
items.push_back(Section);
if (PDNames.find(GoodName) == PDNames.end())
{
strmap::_Pairib res = GoodNameSections.insert(strmap::value_type(GoodName,items));
std::pair<strmap::iterator, bool> res = GoodNameSections.insert(strmap::value_type(GoodName,items));
if (!res.second)
{
res.first->second.push_back(Section);
}
} else {
strmap::_Pairib res = PDNameSections.insert(strmap::value_type(GoodName,items));
std::pair<strmap::iterator, bool> res = PDNameSections.insert(strmap::value_type(GoodName,items));
if (!res.second)
{
res.first->second.push_back(Section);