summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKUDr <kudr@openttd.org>2006-11-14 12:02:36 +0000
committerKUDr <kudr@openttd.org>2006-11-14 12:02:36 +0000
commitecccf79c075ea94433bc277c56e77baee73a3cf7 (patch)
tree616cc0a9337fc4a58db45e5c6192dbd69dbaa122
parent55d6c98f891f219c3118baa5fef6ea05ebe79800 (diff)
downloadopenttd-ecccf79c075ea94433bc277c56e77baee73a3cf7.tar.xz
(svn r7146) -CodeChange: ST_CONST macro removed as it is no longer needed (Tron)
-rw-r--r--stdafx.h11
-rw-r--r--yapf/array.hpp6
-rw-r--r--yapf/blob.hpp4
-rw-r--r--yapf/fixedsizearray.hpp6
-rw-r--r--yapf/hashtable.hpp8
5 files changed, 12 insertions, 23 deletions
diff --git a/stdafx.h b/stdafx.h
index 0dad62624..1db6ed38e 100644
--- a/stdafx.h
+++ b/stdafx.h
@@ -301,15 +301,4 @@ assert_compile(sizeof(uint8) == 1);
#define EXTERN_C_BEGIN extern "C" {
#define EXTERN_C_END }
-
-// workaround for VC6 bug: Error C2258 and error C2252 occur if you try
-// to perform in-place initialization of static const integral member
-// data in Visual C++ (see http://support.microsoft.com/kb/241569/)
-#if defined(_MSC_VER) && (_MSC_VER < 1300)
-# define ST_CONST(type, name_val) enum {name_val};
-#else
-# define ST_CONST(type, name_val) static const type name_val;
-#endif
-
-
#endif /* STDAFX_H */
diff --git a/yapf/array.hpp b/yapf/array.hpp
index 04fbe0983..d6fe2a75f 100644
--- a/yapf/array.hpp
+++ b/yapf/array.hpp
@@ -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() { }
diff --git a/yapf/blob.hpp b/yapf/blob.hpp
index 53e7e1ff5..41d22315f 100644
--- a/yapf/blob.hpp
+++ b/yapf/blob.hpp
@@ -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);}
diff --git a/yapf/fixedsizearray.hpp b/yapf/fixedsizearray.hpp
index e81b6a258..5d6c3b313 100644
--- a/yapf/fixedsizearray.hpp
+++ b/yapf/fixedsizearray.hpp
@@ -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()
diff --git a/yapf/hashtable.hpp b/yapf/hashtable.hpp
index 44ea315e2..268f73dd0 100644
--- a/yapf/hashtable.hpp
+++ b/yapf/hashtable.hpp
@@ -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,