Dasko/snes9x
Dasko/snes9x
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

win32: fix compilation error in vs2019

Browse Source
This commit is contained in:
gocha 2020-01-19 12:48:06 +09:00
parent c7a2fc2290
commit 7f6d9d6432
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conffile.cpp
View File

@ -452,7 +452,7 @@ void ConfigFile::ClearLines()
} }
} }
bool ConfigFile::ConfigEntry::section_then_key_less::operator()(const ConfigEntry &a, const ConfigEntry &b) { bool ConfigFile::ConfigEntry::section_then_key_less::operator()(const ConfigEntry &a, const ConfigEntry &b) const{
if(curConfigFile && a.section!=b.section){ if(curConfigFile && a.section!=b.section){
const int sva = curConfigFile->GetSectionSize(a.section); const int sva = curConfigFile->GetSectionSize(a.section);
const int svb = curConfigFile->GetSectionSize(b.section); const int svb = curConfigFile->GetSectionSize(b.section);

6
conffile.h
View File

@ -90,7 +90,7 @@ class ConfigFile {
mutable bool used; mutable bool used;
struct section_then_key_less { struct section_then_key_less {
bool operator()(const ConfigEntry &a, const ConfigEntry &b); bool operator()(const ConfigEntry &a, const ConfigEntry &b) const;
}; };
struct key_less { struct key_less {
@ -101,8 +101,8 @@ class ConfigFile {
}; };
struct line_less { struct line_less {
bool operator()(const ConfigEntry &a, const ConfigEntry &b){ bool operator()(const ConfigEntry &a, const ConfigEntry &b) const{
if(a.line==b.line) return (b.val.empty() && !a.val.empty()) || a.key<b.key; if(a.line==b.line) return (b.val.empty() && !a.val.empty()) || a.key<b.key;
if(b.line<0) return true; if(b.line<0) return true;
if(a.line<0) return false; if(a.line<0) return false;
return a.line<b.line; return a.line<b.line;