dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix 801cbea9c: operator< is not always the best idea

Browse Source 
Also removes unused and anyway broken SmallMap::SortByKey() function.
This commit is contained in:
glx
2019-04-13 19:55:31 +02:00
committed by glx22
parent 3bbd7ea2c1
commit 410b81537c
3 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/window.cpp
View File

@@ -154,10 +154,10 @@ void WindowDesc::LoadFromConfig()
/**
* Sort WindowDesc by ini_key.
*/
bool WindowDesc::operator< (WindowDesc * const &other) const
static bool DescSorter(WindowDesc* const &a, WindowDesc* const &b)
{
if (this->ini_key != nullptr && other->ini_key != nullptr) return strcmp(this->ini_key, other->ini_key) < 0;
return this->ini_key != nullptr;
if (a->ini_key != nullptr && b->ini_key != nullptr) return strcmp(a->ini_key, b->ini_key) < 0;
return a->ini_key != nullptr;
}
/**
@@ -166,7 +166,7 @@ bool WindowDesc::operator< (WindowDesc * const &other) const
void WindowDesc::SaveToConfig()
{
/* Sort the stuff to get a nice ini file on first write */
std::sort(_window_descs->begin(), _window_descs->end());
std::sort(_window_descs->begin(), _window_descs->end(), DescSorter);
IniFile *ini = new IniFile();
ini->LoadFromDisk(_windows_file, NO_DIRECTORY);