diff options
| author | truebrain <truebrain@openttd.org> | 2011-12-20 17:57:56 +0000 |
|---|---|---|
| committer | truebrain <truebrain@openttd.org> | 2011-12-20 17:57:56 +0000 |
| commit | 1c9bec19993417b1f3b240f2bdb0745aa26c0cb3 (patch) | |
| tree | d09407cc962ee87ac1bbbbc60951cad74c6b1db7 /src/pathfinder/npf/queue.h | |
| parent | 7a38642a1c83531a65907ae784bc03a82d35132a (diff) | |
| download | openttd-1c9bec19993417b1f3b240f2bdb0745aa26c0cb3.tar.xz | |
(svn r23640) -Fix: stop using FORCEINLINE (1/3rd of the instances were, the others were still regular inline), but make sure inline is always a 'forced' inline (I am looking at you MSVC)
Diffstat (limited to 'src/pathfinder/npf/queue.h')
| -rw-r--r-- | src/pathfinder/npf/queue.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pathfinder/npf/queue.h b/src/pathfinder/npf/queue.h index aae70f393..3a5bd1ce9 100644 --- a/src/pathfinder/npf/queue.h +++ b/src/pathfinder/npf/queue.h @@ -43,7 +43,7 @@ struct BinaryHeap { * @param i Element to access (starts at offset \c 1). * @return Value of the element. */ - FORCEINLINE BinaryHeapNode &GetElement(uint i) + inline BinaryHeapNode &GetElement(uint i) { assert(i > 0); return this->elements[(i - 1) >> BINARY_HEAP_BLOCKSIZE_BITS][(i - 1) & BINARY_HEAP_BLOCKSIZE_MASK]; @@ -96,7 +96,7 @@ struct Hash { /** * Gets the current size of the hash. */ - FORCEINLINE uint GetSize() const + inline uint GetSize() const { return this->size; } |