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

Merge branch 'master' into jgrpp

Browse Source 
Remove 'byte' typedef
This commit is contained in:
Jonathan G Rennison
2024-05-07 17:21:50 +01:00
parent f1c0f864f5 6c5a8f55df
commit 18a42664fc
376 changed files with 2220 additions and 2152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/misc/fixedsizearray.hpp
View File

@@ -41,13 +41,13 @@ protected:
/** return reference to the array header (non-const) */
inline ArrayHeader &Hdr()
{
return *(ArrayHeader*)(((byte*)data) - HeaderSize);
return *(ArrayHeader*)(((uint8_t*)data) - HeaderSize);
}
/** return reference to the array header (const) */
inline const ArrayHeader &Hdr() const
{
return *(ArrayHeader*)(((byte*)data) - HeaderSize);
return *(ArrayHeader*)(((uint8_t*)data) - HeaderSize);
}
/** return reference to the block reference counter */
@@ -70,7 +70,7 @@ public:
static_assert(C < (SIZE_MAX - HeaderSize) / Tsize);
/* allocate block for header + items (don't construct items) */
data = (T*)((MallocT<byte>(HeaderSize + C * Tsize)) + HeaderSize);
data = (T*)((MallocT<uint8_t>(HeaderSize + C * Tsize)) + HeaderSize);
SizeRef() = 0; // initial number of items
RefCnt() = 1; // initial reference counter
}
@@ -91,7 +91,7 @@ public:
Clear();
/* free the memory block occupied by items */
free(((byte*)data) - HeaderSize);
free(((uint8_t*)data) - HeaderSize);
data = nullptr;
}

2
src/misc/getoptdata.h
View File

@@ -20,7 +20,7 @@ enum OptionDataFlags {
/** Data of an option. */
struct OptionData {
byte id; ///< Unique identification of this option data, often the same as #shortname.
uint8_t id; ///< Unique identification of this option data, often the same as #shortname.
char shortname; ///< Short option letter if available, else use \c '\0'.
uint16_t flags; ///< Option data flags. @see OptionDataFlags
const char *longname; ///< Long option name including '-'/'--' prefix, use \c nullptr if not available.