mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

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

Also removes unused and anyway broken SmallMap::SortByKey() function.
pull/7073/head
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/smallmap_type.hpp
View File

@ -164,16 +164,6 @@ struct SmallMap : std::vector<SmallPair<T, U> > {
n.first = key; n.first = key;
return n.second; return n.second;
} }
inline void SortByKey()
{
std::sort(std::vector<Pair>::begin(), std::vector<Pair>::end());
}
bool operator< (const Pair &other) const
{
return (*this).first < other.first;
}
}; };
#endif /* SMALLMAP_TYPE_HPP */ #endif /* SMALLMAP_TYPE_HPP */

8
src/window.cpp
View File

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

2
src/window_gui.h
View File

@ -192,8 +192,6 @@ struct WindowDesc : ZeroedMemoryAllocator {
static void LoadFromConfig(); static void LoadFromConfig();
static void SaveToConfig(); static void SaveToConfig();
bool operator< (WindowDesc * const &other) const;
private: private:
int16 default_width_trad; ///< Preferred initial width of the window (pixels at 1x zoom). int16 default_width_trad; ///< Preferred initial width of the window (pixels at 1x zoom).
int16 default_height_trad; ///< Preferred initial height of the window (pixels at 1x zoom). int16 default_height_trad; ///< Preferred initial height of the window (pixels at 1x zoom).