Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mumble-voip/mumble.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikkel Krautz <mikkel@krautz.dk>2017-03-18 12:10:25 +0300
committerMikkel Krautz <mikkel@krautz.dk>2017-03-18 12:10:25 +0300
commit8728ea7d487e8974d2e9e6fe5cfb4ece669377b1 (patch)
treede1a7acec8be052d983b309f99b18d19940e474e /src/murmur/MurmurIce.cpp
parent10079ed9867308aad098231f86e260bd831b0ac6 (diff)
MurmurIce: fix signed/unsigned comparison between string size and std::numeric_limits.
std::numeric_limit's max() method return a T, so when comparing it against a container size, we have to cast it to size_t. This is currently breaking the win32-static (32-bit) build.
Diffstat (limited to 'src/murmur/MurmurIce.cpp')
-rw-r--r--src/murmur/MurmurIce.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/murmur/MurmurIce.cpp b/src/murmur/MurmurIce.cpp
index d3355cb7a..b43de9353 100644
--- a/src/murmur/MurmurIce.cpp
+++ b/src/murmur/MurmurIce.cpp
@@ -73,7 +73,7 @@ static std::string iceString(const QString &s) {
/// If the function is passed a string bigger than that,
/// it will return an empty string.
static std::string iceBase64(const std::string &s) {
- if (s.size() > std::numeric_limits<int>::max()) {
+ if (s.size() > static_cast<size_t>(std::numeric_limits<int>::max())) {
return std::string();
}