diff options
| author | Michael Lutz <michi@icosahedron.de> | 2020-05-17 23:31:44 +0200 |
|---|---|---|
| committer | Michael Lutz <michi@icosahedron.de> | 2020-05-21 20:02:34 +0200 |
| commit | f2b40f40aa7cbccaed20ec52b41d4704a45d8db1 (patch) | |
| tree | 2f8268a7292118c9e460524a139ab85766ed3425 /src/fontcache.cpp | |
| parent | 7309bdec48c70499301eb579991c2db6f7ef1d99 (diff) | |
| download | openttd-f2b40f40aa7cbccaed20ec52b41d4704a45d8db1.tar.xz | |
Codechange: Replace SmallPair with std::pair.
std::pair is already the smallest possible pair, and it already handles non-POD types correctly.
Diffstat (limited to 'src/fontcache.cpp')
| -rw-r--r-- | src/fontcache.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/fontcache.cpp b/src/fontcache.cpp index 9102f356a..6cdac1fab 100644 --- a/src/fontcache.cpp +++ b/src/fontcache.cpp @@ -211,7 +211,7 @@ protected: int req_size; ///< Requested font size. int used_size; ///< Used font size. - typedef SmallMap<uint32, SmallPair<size_t, const void*> > FontTable; ///< Table with font table cache + typedef SmallMap<uint32, std::pair<size_t, const void*> > FontTable; ///< Table with font table cache FontTable font_tables; ///< Cached font tables. /** Container for information about a glyph. */ @@ -434,7 +434,7 @@ const void *TrueTypeFontCache::GetFontTable(uint32 tag, size_t &length) const void *result = this->InternalGetFontTable(tag, length); - this->font_tables.Insert(tag, SmallPair<size_t, const void *>(length, result)); + this->font_tables.Insert(tag, std::pair<size_t, const void *>(length, result)); return result; } |