diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/helpers.hpp | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/helpers.hpp b/src/helpers.hpp index f185eecec..4163be4ac 100644 --- a/src/helpers.hpp +++ b/src/helpers.hpp @@ -136,7 +136,15 @@ template <typename Tenum_t> struct TinyEnumT } /** postfix ++ operator on tiny type */ - FORCEINLINE TinyEnumT& operator ++ (int) + FORCEINLINE TinyEnumT operator ++ (int) + { + TinyEnumT org = *this; + if (++m_val >= end) m_val -= (storage_type)(end - begin); + return org; + } + + /** prefix ++ operator on tiny type */ + FORCEINLINE TinyEnumT& operator ++ () { if (++m_val >= end) m_val -= (storage_type)(end - begin); return *this; @@ -208,8 +216,10 @@ public: FORCEINLINE OverflowSafeInt operator - (const int other) const { OverflowSafeInt result = *this; result -= (int64)other; return result; } FORCEINLINE OverflowSafeInt operator - (const uint other) const { OverflowSafeInt result = *this; result -= (int64)other; return result; } - FORCEINLINE OverflowSafeInt& operator ++ (int) { return *this += 1; } - FORCEINLINE OverflowSafeInt& operator -- (int) { return *this += -1; } + FORCEINLINE OverflowSafeInt& operator ++ () { return *this += 1; } + FORCEINLINE OverflowSafeInt& operator -- () { return *this += -1; } + FORCEINLINE OverflowSafeInt operator ++ (int) { OverflowSafeInt org = *this; *this += 1; return org; } + FORCEINLINE OverflowSafeInt operator -- (int) { OverflowSafeInt org = *this; *this += -1; return org; } /** * Safe implementation of multiplication. |