Mercurial > hg > openttd
changeset 13029:0175b6426e2c draft
(svn r17527) -Codechange: use QSortT instead of qsort for sorting smallmaps
| author | rubidium <rubidium@openttd.org> |
|---|---|
| date | Sun, 13 Sep 2009 17:38:49 +0000 |
| parents | 30e0feabeff8 |
| children | 12fa346326b0 |
| files | src/core/smallmap_type.hpp |
| diffstat | 1 files changed, 4 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/core/smallmap_type.hpp +++ b/src/core/smallmap_type.hpp @@ -13,6 +13,7 @@ #define SMALLMAP_TYPE_HPP #include "smallvec_type.hpp" +#include "sort_func.hpp" /** Simple pair of data. Both types have to be POD ("Plain Old Data")! */ template <typename T, typename U> @@ -105,14 +106,12 @@ FORCEINLINE void SortByKey() { - qsort(this->Begin(), this->items, sizeof(Pair), KeySorter); + QSortT(this->Begin(), this->items, KeySorter); } - static int CDECL KeySorter(const void *a, const void *b) + static int CDECL KeySorter(const Pair *a, const Pair *b) { - const Pair *pa = (const Pair*)a; - const Pair *pb = (const Pair*)b; - return pa->first - pb->first; + return a->first - b->first; } };