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

(svn r18824) -Codechange: Turn some public members into protected ones. (skidd13)

Browse Source
This commit is contained in:
frosch
2010-01-16 14:12:18 +00:00
parent 085e9251c5
commit e6faf06b68
2 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/misc/fixedsizearray.hpp
View File

@@ -20,10 +20,7 @@
* is delayed. */
template <class T, uint C>
struct FixedSizeArray {
/** the only member of fixed size array is pointer to the block
* of C array of items. Header can be found on the offset -sizeof(ArrayHeader). */
T *data;
protected:
/** header for fixed size array */
struct ArrayHeader
{
@@ -35,6 +32,20 @@ struct FixedSizeArray {
static const uint Tsize = sizeof(T); // size of item
static const uint HeaderSize = sizeof(ArrayHeader); // size of header
/** the only member of fixed size array is pointer to the block
* of C array of items. Header can be found on the offset -sizeof(ArrayHeader). */
T *data;
/** return reference to the array header (non-const) */
FORCEINLINE ArrayHeader& Hdr() { return *(ArrayHeader*)(((byte*)data) - HeaderSize); }
/** return reference to the array header (const) */
FORCEINLINE const ArrayHeader& Hdr() const { return *(ArrayHeader*)(((byte*)data) - HeaderSize); }
/** return reference to the block reference counter */
FORCEINLINE uint& RefCnt() { return Hdr().reference_count; }
/** return reference to number of used items */
FORCEINLINE uint& SizeRef() { return Hdr().items; }
public:
/** Default constructor. Preallocate space for items and header, then initialize header. */
FixedSizeArray()
{
@@ -75,16 +86,6 @@ struct FixedSizeArray {
SizeRef() = 0;
}
protected:
/** return reference to the array header (non-const) */
FORCEINLINE ArrayHeader& Hdr() { return *(ArrayHeader*)(((byte*)data) - HeaderSize); }
/** return reference to the array header (const) */
FORCEINLINE const ArrayHeader& Hdr() const { return *(ArrayHeader*)(((byte*)data) - HeaderSize); }
/** return reference to the block reference counter */
FORCEINLINE uint& RefCnt() { return Hdr().reference_count; }
/** return reference to number of used items */
FORCEINLINE uint& SizeRef() { return Hdr().items; }
public:
/** return number of used items */
FORCEINLINE uint Length() const { return Hdr().items; }
/** return true if array is full */