aboutsummaryrefslogtreecommitdiff
path: root/src/server.cpp
diff options
context:
space:
mode:
authorCraig Robbins <kde.psych@gmail.com>2014-12-29 23:53:08 +1000
committerCraig Robbins <kde.psych@gmail.com>2014-12-29 23:56:40 +1000
commit3993102e880f2a31b6fef9484b8527a58e850744 (patch)
tree780f07bbcddbf5ec0e2b820d675aff615cab0476 /src/server.cpp
parent5038b9aaeced00396e37f4d6665f8afe21169a8a (diff)
downloadminetest-3993102e880f2a31b6fef9484b8527a58e850744.tar.xz
Fix -Wtype-limits warnings and remove disabling of -Wtype-limits
Diffstat (limited to 'src/server.cpp')
-rw-r--r--src/server.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server.cpp b/src/server.cpp
index 161aaafc7..a52cd639d 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -1361,7 +1361,7 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
u8 client_max = data[2];
u8 our_max = SER_FMT_VER_HIGHEST_READ;
// Use the highest version supported by both
- u8 deployed = std::min(client_max, our_max);
+ int deployed = std::min(client_max, our_max);
// If it's lower than the lowest supported, give up.
if(deployed < SER_FMT_VER_LOWEST)
deployed = SER_FMT_VER_INVALID;