diff options
| author | Andrei Karas <akaras@inbox.ru> | 2018-04-21 07:05:46 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2018-04-23 03:31:27 +0300 |
| commit | a946678bc7f37475ecef5b4282a77bc4e0f1afa7 (patch) | |
| tree | 6a755ab178b932d7761ab76a64dd33c62373d700 | |
| parent | deef43ce3342df308cd19c9ff37a2e953ed31cf1 (diff) | |
| download | manaplus-a946678bc7f37475ecef5b4282a77bc4e0f1afa7.tar.gz manaplus-a946678bc7f37475ecef5b4282a77bc4e0f1afa7.tar.bz2 manaplus-a946678bc7f37475ecef5b4282a77bc4e0f1afa7.tar.xz manaplus-a946678bc7f37475ecef5b4282a77bc4e0f1afa7.zip | |
Add cast into macro toInt for old compilers.
| -rw-r--r-- | src/enums/simpletypes/intdefines.h | 2 | ||||
| -rw-r--r-- | src/net/messagein.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/enums/simpletypes/intdefines.h b/src/enums/simpletypes/intdefines.h index 6e030f72a..2977d87a5 100644 --- a/src/enums/simpletypes/intdefines.h +++ b/src/enums/simpletypes/intdefines.h @@ -43,7 +43,7 @@ const name name##_zero = 0; \ const name name##_one = 1 #define fromInt(val, name) static_cast<name>(val) -#define toInt(val, name) (val) +#define toInt(val, name) static_cast<name>(val) #define defIntEnumNeg(name) const name name##_negOne = -1 #endif // ADVGCC diff --git a/src/net/messagein.cpp b/src/net/messagein.cpp index 1226102d7..5b942a2d0 100644 --- a/src/net/messagein.cpp +++ b/src/net/messagein.cpp @@ -189,7 +189,7 @@ int32_t MessageIn::readInt32(const char *const str) uint32_t MessageIn::readUInt32(const char *const str) { - uint32_t value = -1; + uint32_t value = 0; if (mPos + 4 <= mLength) { #if SDL_BYTEORDER == SDL_BIG_ENDIAN |