(svn r27363) -Codechange: Fix codestyle of one-line methods and header codestyle of derived structs.
This commit is contained in:
@@ -41,13 +41,28 @@ protected:
|
||||
T *data;
|
||||
|
||||
/** return reference to the array header (non-const) */
|
||||
inline ArrayHeader& Hdr() { return *(ArrayHeader*)(((byte*)data) - HeaderSize); }
|
||||
inline ArrayHeader& Hdr()
|
||||
{
|
||||
return *(ArrayHeader*)(((byte*)data) - HeaderSize);
|
||||
}
|
||||
|
||||
/** return reference to the array header (const) */
|
||||
inline const ArrayHeader& Hdr() const { return *(ArrayHeader*)(((byte*)data) - HeaderSize); }
|
||||
inline const ArrayHeader& Hdr() const
|
||||
{
|
||||
return *(ArrayHeader*)(((byte*)data) - HeaderSize);
|
||||
}
|
||||
|
||||
/** return reference to the block reference counter */
|
||||
inline uint& RefCnt() { return Hdr().reference_count; }
|
||||
inline uint& RefCnt()
|
||||
{
|
||||
return Hdr().reference_count;
|
||||
}
|
||||
|
||||
/** return reference to number of used items */
|
||||
inline uint& SizeRef() { return Hdr().items; }
|
||||
inline uint& SizeRef()
|
||||
{
|
||||
return Hdr().items;
|
||||
}
|
||||
|
||||
public:
|
||||
/** Default constructor. Preallocate space for items and header, then initialize header. */
|
||||
@@ -96,19 +111,50 @@ public:
|
||||
}
|
||||
|
||||
/** return number of used items */
|
||||
inline uint Length() const { return Hdr().items; }
|
||||
inline uint Length() const
|
||||
{
|
||||
return Hdr().items;
|
||||
}
|
||||
|
||||
/** return true if array is full */
|
||||
inline bool IsFull() const { return Length() >= C; }
|
||||
inline bool IsFull() const
|
||||
{
|
||||
return Length() >= C;
|
||||
}
|
||||
|
||||
/** return true if array is empty */
|
||||
inline bool IsEmpty() const { return Length() <= 0; }
|
||||
inline bool IsEmpty() const
|
||||
{
|
||||
return Length() <= 0;
|
||||
}
|
||||
|
||||
/** add (allocate), but don't construct item */
|
||||
inline T *Append() { assert(!IsFull()); return &data[SizeRef()++]; }
|
||||
inline T *Append()
|
||||
{
|
||||
assert(!IsFull());
|
||||
return &data[SizeRef()++];
|
||||
}
|
||||
|
||||
/** add and construct item using default constructor */
|
||||
inline T *AppendC() { T *item = Append(); new(item)T; return item; }
|
||||
inline T *AppendC()
|
||||
{
|
||||
T *item = Append();
|
||||
new(item)T;
|
||||
return item;
|
||||
}
|
||||
/** return item by index (non-const version) */
|
||||
inline T& operator[](uint index) { assert(index < Length()); return data[index]; }
|
||||
inline T& operator[](uint index)
|
||||
{
|
||||
assert(index < Length());
|
||||
return data[index];
|
||||
}
|
||||
|
||||
/** return item by index (const version) */
|
||||
inline const T& operator[](uint index) const { assert(index < Length()); return data[index]; }
|
||||
inline const T& operator[](uint index) const
|
||||
{
|
||||
assert(index < Length());
|
||||
return data[index];
|
||||
}
|
||||
};
|
||||
|
||||
#endif /* FIXEDSIZEARRAY_HPP */
|
||||
|
Reference in New Issue
Block a user