From 6c279ad6a71c63cb595fde7c951aadb31c3dbebc Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Tue, 6 Feb 2018 12:55:58 +0000 Subject: MDEV-15091 : Windows, 64bit: reenable and fix warning C4267 (conversion from 'size_t' to 'type', possible loss of data) Handle string length as size_t, consistently (almost always:)) Change function prototypes to accept size_t, where in the past ulong or uint were used. change local/member variables to size_t when appropriate. This fix excludes rocksdb, spider,spider, sphinx and connect for now. --- sql/vers_string.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sql/vers_string.h') diff --git a/sql/vers_string.h b/sql/vers_string.h index 756aea82794..0760613cd89 100644 --- a/sql/vers_string.h +++ b/sql/vers_string.h @@ -54,20 +54,20 @@ struct LEX_STRING_u : public Storage Storage::str= NULL; Storage::length= 0; } - LEX_STRING_u(const char *_str, uint32 _len, CHARSET_INFO *) + LEX_STRING_u(const char *_str, size_t _len, CHARSET_INFO *) { Storage::str= _str; Storage::length= _len; } uint32 length() const { - return Storage::length; + return (uint32)Storage::length; } const char *ptr() const { return Storage::str; } - void set(const char *_str, uint32 _len, CHARSET_INFO *) + void set(const char *_str, size_t _len, CHARSET_INFO *) { Storage::str= _str; Storage::length= _len; -- cgit v1.2.1