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

Codechange: Replace SmallPair with std::pair.

Browse Source 
std::pair is already the smallest possible pair, and it already handles non-POD types correctly.
This commit is contained in:
Michael Lutz
2020-05-17 23:31:44 +02:00
parent 7309bdec48
commit f2b40f40aa
9 changed files with 24 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/newgrf_config.cpp
View File

@@ -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);
}
}