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/newgrf_config.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/newgrf_config.cpp')
| -rw-r--r-- | src/newgrf_config.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/newgrf_config.cpp b/src/newgrf_config.cpp index a0960350d..605bceca5 100644 --- a/src/newgrf_config.cpp +++ b/src/newgrf_config.cpp @@ -262,7 +262,7 @@ GRFParameterInfo::GRFParameterInfo(GRFParameterInfo &info) : complete_labels(info.complete_labels) { for (uint i = 0; i < info.value_names.size(); i++) { - SmallPair<uint32, GRFText *> *data = info.value_names.data() + i; + std::pair<uint32, GRFText *> *data = info.value_names.data() + i; this->value_names.Insert(data->first, DuplicateGRFText(data->second)); } } @@ -273,7 +273,7 @@ GRFParameterInfo::~GRFParameterInfo() CleanUpGRFText(this->name); CleanUpGRFText(this->desc); for (uint i = 0; i < this->value_names.size(); i++) { - SmallPair<uint32, GRFText *> *data = this->value_names.data() + i; + std::pair<uint32, GRFText *> *data = this->value_names.data() + i; CleanUpGRFText(data->second); } } |