diff options
| author | Henry Wilson <m3henry@googlemail.com> | 2018-09-20 22:41:43 +0100 |
|---|---|---|
| committer | PeterN <peter@fuzzle.org> | 2019-03-26 20:15:57 +0000 |
| commit | 4b349c0f90c3f7b6a39171cec41cd98dcd0d88b7 (patch) | |
| tree | cc3ae4e4a7a4defd8a672ae9dd3983bd02b654f4 /src/fios_gui.cpp | |
| parent | 7a32cf1401d289f04682aa91fbfb779cbb2378e4 (diff) | |
| download | openttd-4b349c0f90c3f7b6a39171cec41cd98dcd0d88b7.tar.xz | |
Codechange: [core] Implement SmallVector using std::vector
The public and protected interface to SmallVector are unchanged
SmallVector now requires that items be default constructible
This isn't an issue since some contained items were previously created
uninitialized.
Temporary default constructors are added to the following structs
- SmallPair
- SmallStackItem
- GRFPresence
Where vector<bool> is required, transition immediately to std::vector
to avoid returning proxy object references.
Diffstat (limited to 'src/fios_gui.cpp')
| -rw-r--r-- | src/fios_gui.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/fios_gui.cpp b/src/fios_gui.cpp index f2f96cd28..f4a2f497b 100644 --- a/src/fios_gui.cpp +++ b/src/fios_gui.cpp @@ -279,7 +279,7 @@ private: StringFilter string_filter; ///< Filter for available games. QueryString filter_editbox; ///< Filter editbox; - SmallVector<bool, 32> fios_items_shown; ///< Map of the filtered out fios items + std::vector<bool> fios_items_shown; ///< Map of the filtered out fios items static void SaveGameConfirmationCallback(Window *w, bool confirmed) { @@ -824,7 +824,7 @@ public: case SLIWD_FILTER_CHANGES: /* Filter changes */ - this->fios_items_shown.Resize(this->fios_items.Length()); + this->fios_items_shown.resize(this->fios_items.Length()); uint items_shown_count = 0; ///< The number of items shown in the list /* We pass through every fios item */ for (uint i = 0; i < this->fios_items.Length(); i++) { |