cpp/openttd-patchpack/source Changeset - r17577:221f002c3114

Changeset - r17577:221f002c3114

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

smatz - 13 years ago 2011-04-19 18:20:34
smatz@openttd.org

(svn r22351) -Revert (r17101): and reinstall r16546. Hash tables are much smaller now, so it shouldn't cause crash anymore

1 file changed with 4 insertions and 9 deletions:

src/misc/hashtable.hpp

0 comments (0 inline, 0 general)

src/misc/hashtable.hpp

➞

Show inline comments

@@ @@ -145,20 +145,15 @@ protected: @@
 	 */
 	typedef CHashTableSlotT<Titem_> Slot;
 	Slot *m_slots;     // here we store our data (array of blobs)
 	int   m_num_items; // item counter
 	Slot  m_slots[Tcapacity]; // here we store our data (array of blobs)
 	int   m_num_items;        // item counter
 public:
 	/* default constructor */
 	FORCEINLINE CHashTableT()
+	FORCEINLINE CHashTableT() : m_num_items(0)
+	{
 		/* construct all slots */
 		m_slots = new Slot[Tcapacity];
 		m_num_items = 0;
+	}
 	~CHashTableT() {delete [] m_slots; m_num_items = 0; m_slots = NULL;}
 protected:
 	/** static helper - return hash for the given key modulo number of slots */
 	FORCEINLINE static int CalcHash(const Tkey& key)
@@ @@ -180,7 +175,7 @@ public: @@
 	FORCEINLINE int Count() const {return m_num_items;}
 	/** simple clear - forget all items - used by CSegmentCostCacheT.Flush() */
-	FORCEINLINE void Clear() const {for (int i = 0; i < Tcapacity; i++) m_slots[i].Clear();}
 	FORCEINLINE void Clear() {for (int i = 0; i < Tcapacity; i++) m_slots[i].Clear();}
 	/** const item search */
 	const Titem_ *Find(const Tkey& key) const

0 comments (0 inline, 0 general)