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/newgrf.cpp | |
| 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/newgrf.cpp')
| -rw-r--r-- | src/newgrf.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/newgrf.cpp b/src/newgrf.cpp index 10fe40359..4d58fe590 100644 --- a/src/newgrf.cpp +++ b/src/newgrf.cpp @@ -207,7 +207,7 @@ protected: public: ByteReader(byte *data, byte *end) : data(data), end(end) { } - FORCEINLINE byte ReadByte() + inline byte ReadByte() { if (data < end) return *(data)++; throw OTTDByteReaderSignal(); @@ -261,22 +261,22 @@ public: return string; } - FORCEINLINE size_t Remaining() const + inline size_t Remaining() const { return end - data; } - FORCEINLINE bool HasData(size_t count = 1) const + inline bool HasData(size_t count = 1) const { return data + count <= end; } - FORCEINLINE byte *Data() + inline byte *Data() { return data; } - FORCEINLINE void Skip(size_t len) + inline void Skip(size_t len) { data += len; /* It is valid to move the buffer to exactly the end of the data, |