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

(svn r7146) -CodeChange: ST_CONST macro removed as it is no longer needed (Tron)

Browse Source
This commit is contained in:
KUDr
2006-11-14 12:02:36 +00:00
parent a0b44e744f
commit 8a588f9cf1
5 changed files with 12 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
yapf/array.hpp
View File

@@ -18,9 +18,9 @@ protected:
CSuperArray m_a; ///< array of arrays of items
public:
ST_CONST(int, Tblock_size = Tblock_size_) ///< block size is now visible from outside
ST_CONST(int, Tnum_blocks = Tnum_blocks_) ///< number of blocks is now visible from outside
ST_CONST(int, Tcapacity = Tblock_size * Tnum_blocks) ///< total max number of items
static const int Tblock_size = Tblock_size_; ///< block size is now visible from outside
static const int Tnum_blocks = Tnum_blocks_; ///< number of blocks is now visible from outside
static const int Tcapacity = Tblock_size * Tnum_blocks; ///< total max number of items
/** implicit constructor */
FORCEINLINE CArrayT() { }

4
yapf/blob.hpp
View File

@@ -32,7 +32,7 @@ protected:
} ptr_u;
public:
ST_CONST(int, Ttail_reserve = 4) // four extra bytes will be always allocated and zeroed at the end
static const int Ttail_reserve = 4; // four extra bytes will be always allocated and zeroed at the end
FORCEINLINE CBlobBaseSimple() { InitEmpty(); }
FORCEINLINE CBlobBaseSimple(const CBlobBaseSimple& src)
@@ -169,7 +169,7 @@ public:
typedef Titem_ Titem;
typedef Tbase_ Tbase;
ST_CONST(int, Titem_size = sizeof(Titem))
static const int Titem_size = sizeof(Titem);
FORCEINLINE CBlobT() : Tbase() {}
FORCEINLINE CBlobT(const Tbase& src) : Tbase(src) {assert((RawSize() % Titem_size) == 0);}

6
yapf/fixedsizearray.hpp
View File

@@ -24,9 +24,9 @@ struct CFixedSizeArrayT {
// make types and constants visible from outside
typedef Titem_ Titem; // type of array item
ST_CONST(int, Tcapacity = Tcapacity_) // the array capacity (maximum size)
ST_CONST(int, TitemSize = sizeof(Titem_)) // size of item
ST_CONST(int, ThdrSize = sizeof(CHdr)) // size of header
static const int Tcapacity = Tcapacity_; // the array capacity (maximum size)
static const int TitemSize = sizeof(Titem_); // size of item
static const int ThdrSize = sizeof(CHdr); // size of header
/** Default constructor. Preallocate space for items and header, then initialize header. */
CFixedSizeArrayT()

8
yapf/hashtable.hpp
View File

@@ -118,10 +118,10 @@ struct CHashTableSlotT
template <class Titem_, int Thash_bits_>
class CHashTableT {
public:
typedef Titem_ Titem; // make Titem_ visible from outside of class
typedef typename Titem_::Key Tkey; // make Titem_::Key a property of HashTable
ST_CONST(int, Thash_bits = Thash_bits_) // publish num of hash bits
ST_CONST(int, Tcapacity = 1 << Thash_bits) // and num of slots 2^bits
typedef Titem_ Titem; // make Titem_ visible from outside of class
typedef typename Titem_::Key Tkey; // make Titem_::Key a property of HashTable
static const int Thash_bits = Thash_bits_; // publish num of hash bits
static const int Tcapacity = 1 << Thash_bits; // and num of slots 2^bits
protected:
/** each slot contains pointer to the first item in the list,