mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Codechange: Use std::array for TemporaryStorageArray. 

This removes the need for initialisation with memset().
This commit is contained in:
Peter Nelson 2023-09-08 20:41:46 +01:00 committed by PeterN
parent 9040d7813d
commit 7bd019df90
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/newgrf_storage.h
View File

@ -131,17 +131,12 @@ struct PersistentStorageArray : BasePersistentStorageArray {
*/ */
template <typename TYPE, uint SIZE> template <typename TYPE, uint SIZE>
struct TemporaryStorageArray { struct TemporaryStorageArray {
TYPE storage[SIZE]; ///< Memory to for the storage array using StorageType = std::array<TYPE, SIZE>;
uint16_t init[SIZE]; ///< Storage has been assigned, if this equals 'init_key'. using StorageInitType = std::array<uint16_t, SIZE>;
uint16_t init_key; ///< Magic key to 'init'.
/** Simply construct the array */ StorageType storage{}; ///< Memory for the storage array
TemporaryStorageArray() StorageInitType init{}; ///< Storage has been assigned, if this equals 'init_key'.
{ uint16_t init_key{1}; ///< Magic key to 'init'.
memset(this->storage, 0, sizeof(this->storage)); // not exactly needed, but makes code analysers happy
memset(this->init, 0, sizeof(this->init));
this->init_key = 1;
}
/** /**
* Stores some value at a given position. * Stores some value at a given position.
@ -181,7 +176,7 @@ struct TemporaryStorageArray {
this->init_key++; this->init_key++;
if (this->init_key == 0) { if (this->init_key == 0) {
/* When init_key wraps around, we need to reset everything */ /* When init_key wraps around, we need to reset everything */
memset(this->init, 0, sizeof(this->init)); this->init = {};
this->init_key = 1; this->init_key = 1;
} }
} }