(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)

This commit is contained in:
truebrain
2011-12-20 17:57:56 +00:00
parent 990045e2b3
commit aa1a0053b0
75 changed files with 673 additions and 672 deletions

View File

@@ -27,7 +27,7 @@ public:
protected:
/** to access inherited path finder */
FORCEINLINE Tpf& Yapf()
inline Tpf& Yapf()
{
return *static_cast<Tpf*>(this);
}
@@ -47,7 +47,7 @@ public:
}
/** return debug report character to identify the transportation type */
FORCEINLINE char TransportTypeChar() const
inline char TransportTypeChar() const
{
return 'w';
}
@@ -123,7 +123,7 @@ public:
* Calculates only the cost of given node, adds it to the parent node cost
* and stores the result into Node::m_cost member
*/
FORCEINLINE bool PfCalcCost(Node& n, const TrackFollower *tf)
inline bool PfCalcCost(Node& n, const TrackFollower *tf)
{
/* base tile cost depending on distance */
int c = IsDiagonalTrackdir(n.GetTrackdir()) ? YAPF_TILE_LENGTH : YAPF_TILE_CORNER_LENGTH;