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

Re-order various structs to reduce holes/padding

Browse Source
This commit is contained in:
Jonathan G Rennison
2024-01-23 19:19:31 +00:00
parent b64a51876a
commit b01fd1607a
17 changed files with 97 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/backup_type.hpp
View File

@@ -25,7 +25,7 @@ struct Backup {
* @param file Filename for debug output. Use FILE_LINE macro.
* @param line Linenumber for debug output. Use FILE_LINE macro.
*/
Backup(T &original, const char * const file, const int line) : original(original), valid(true), original_value(original), file(file), line(line) {}
Backup(T &original, const char * const file, const int line) : original(original), file(file), line(line), valid(true), original_value(original) {}
/**
* Backup variable and switch to new value.
@@ -35,7 +35,7 @@ struct Backup {
* @param line Linenumber for debug output. Use FILE_LINE macro.
*/
template <typename U>
Backup(T &original, const U &new_value, const char * const file, const int line) : original(original), valid(true), original_value(original), file(file), line(line)
Backup(T &original, const U &new_value, const char * const file, const int line) : original(original), file(file), line(line), valid(true), original_value(original)
{
/* Note: We use a separate typename U, so type conversions are handled by assignment operator. */
original = new_value;
@@ -137,11 +137,10 @@ struct Backup {
private:
T &original;
bool valid;
T original_value;
const char * const file;
const int line;
bool valid;
T original_value;
};
struct AutoRestoreBackupNoNewValueTag {};