summaryrefslogtreecommitdiff
path: root/sql/gstream.cc
diff options
context:
space:
mode:
authorgeorg@lmy002.wdf.sap.corp <>2005-06-13 12:41:15 +0200
committergeorg@lmy002.wdf.sap.corp <>2005-06-13 12:41:15 +0200
commitb64e6db5a4d6807fe693c22b5b743968264a83dc (patch)
tree0a4d130bc8c5eb5d2582f3864b50584de7a5647f /sql/gstream.cc
parent55f962c0cfff56ce5d9e0639072fdd65541ea471 (diff)
downloadmariadb-git-b64e6db5a4d6807fe693c22b5b743968264a83dc.tar.gz
fixes for windows 64-bit compiler warnings
Diffstat (limited to 'sql/gstream.cc')
-rw-r--r--sql/gstream.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/gstream.cc b/sql/gstream.cc
index f7d11d76b0c..4083cb2fe71 100644
--- a/sql/gstream.cc
+++ b/sql/gstream.cc
@@ -83,7 +83,7 @@ bool Gis_read_stream::get_next_number(double *d)
}
*d = my_strntod(m_charset, (char *)m_cur,
- m_limit-m_cur, &endptr, &err);
+ (uint) (m_limit-m_cur), &endptr, &err);
if (err)
return 1;
if (endptr)
@@ -115,6 +115,6 @@ bool Gis_read_stream::check_next_symbol(char symbol)
void Gis_read_stream::set_error_msg(const char *msg)
{
size_t len= strlen(msg); // ok in this context
- m_err_msg= (char *) my_realloc(m_err_msg, len + 1, MYF(MY_ALLOW_ZERO_PTR));
+ m_err_msg= (char *) my_realloc(m_err_msg, (uint) len + 1, MYF(MY_ALLOW_ZERO_PTR));
memcpy(m_err_msg, msg, len + 1);
}