summaryrefslogtreecommitdiff
path: root/src/util
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2014-10-22 10:45:42 +0200
committerKonstantin Käfer <mail@kkaefer.com>2014-10-22 11:00:34 +0200
commit2f3952b30541d5bbb3579c39a36052c02b47b37a (patch)
treec6376f8ec6e386f29578b39c4da5a5c822086153 /src/util
parentb9d422ebc3d48ff91e8f2eda071a0596ada36233 (diff)
downloadqtlocation-mapboxgl-2f3952b30541d5bbb3579c39a36052c02b47b37a.tar.gz
fix compile warnings
Diffstat (limited to 'src/util')
-rw-r--r--src/util/compression.cpp4
-rw-r--r--src/util/parsedate.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/util/compression.cpp b/src/util/compression.cpp
index de4e09764c..d6d6370546 100644
--- a/src/util/compression.cpp
+++ b/src/util/compression.cpp
@@ -18,7 +18,7 @@ std::string compress(const std::string &raw) {
}
deflate_stream.next_in = (Bytef *)raw.data();
- deflate_stream.avail_in = raw.size();
+ deflate_stream.avail_in = uInt(raw.size());
std::string result;
char out[16384];
@@ -53,7 +53,7 @@ std::string decompress(const std::string &raw) {
}
inflate_stream.next_in = (Bytef *)raw.data();
- inflate_stream.avail_in = raw.size();
+ inflate_stream.avail_in = uInt(raw.size());
std::string result;
char out[15384];
diff --git a/src/util/parsedate.c b/src/util/parsedate.c
index 123c5c4e5f..f888def853 100644
--- a/src/util/parsedate.c
+++ b/src/util/parsedate.c
@@ -208,7 +208,7 @@ int raw_equal(const char *first, const char *second)
int clamp_to_int(long slnum)
{
- return slnum > INT_MAX ? INT_MAX : slnum < INT_MIN ? INT_MIN : slnum;
+ return slnum > INT_MAX ? INT_MAX : slnum < INT_MIN ? INT_MIN : (int)slnum;
}