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

Merge pull request #1642 from JunielKatarn/vc-14.2 

Make code base compatible with Visual Studio 2019.
This commit is contained in:
zilmar 2019-08-17 19:55:40 +09:30 committed by GitHub
parent 5b4f2250e2 05c2b59c3a
commit 37362c7ade
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
PropertySheets/Platform.props
View File

@ -2,7 +2,8 @@
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="Configuration"> <PropertyGroup Label="Configuration">
<PlatformToolset Condition="'$(DefaultPlatformToolset)'!=''">$(DefaultPlatformToolset)_xp</PlatformToolset> <PlatformToolset Condition="'$(DefaultPlatformToolset)'!='' AND '$(DefaultPlatformToolset)'!='v142'">$(DefaultPlatformToolset)_xp</PlatformToolset>
<PlatformToolset Condition="'$(DefaultPlatformToolset)'=='v142'">$(DefaultPlatformToolset)</PlatformToolset>
</PropertyGroup> </PropertyGroup>
<ImportGroup Label="PropertySheets"> <ImportGroup Label="PropertySheets">

7
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();
breakpoints_t::_Pairib res = m_Execution.insert(breakpoint_t::value_type(address, bTemporary)); #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) if (!res.second && !bTemporary)
{ {
res.first->second = true; res.first->second = true;