diff options
author | 2015-09-08 12:07:32 -0700 | |
---|---|---|
committer | 2015-09-08 12:07:32 -0700 | |
commit | 00756157e51657e8c36ec13b0fc5d1300c58a462 (patch) | |
tree | 749ce396f6dc6f9f61a2a865c8fec03d25300dea /src/core | |
parent | 0fe810a8a62c94f85a82f9d9c1ab29a587ff8a3f (diff) |
Fixed warnings on ICU imported files
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/basetypes/icu-ucsdet/cstring.c | 2 | ||||
-rw-r--r-- | src/core/basetypes/icu-ucsdet/uinvchar.c | 4 | ||||
-rw-r--r-- | src/core/basetypes/icu-ucsdet/ustring.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/core/basetypes/icu-ucsdet/cstring.c b/src/core/basetypes/icu-ucsdet/cstring.c index 3af959eb..868ee5c0 100644 --- a/src/core/basetypes/icu-ucsdet/cstring.c +++ b/src/core/basetypes/icu-ucsdet/cstring.c @@ -225,7 +225,7 @@ U_CAPI int32_t U_EXPORT2 T_CString_stringToInteger(const char *integerString, int32_t radix) { char *end; - return uprv_strtoul(integerString, &end, radix); + return (int32_t)uprv_strtoul(integerString, &end, radix); } diff --git a/src/core/basetypes/icu-ucsdet/uinvchar.c b/src/core/basetypes/icu-ucsdet/uinvchar.c index f874edd9..81f73d80 100644 --- a/src/core/basetypes/icu-ucsdet/uinvchar.c +++ b/src/core/basetypes/icu-ucsdet/uinvchar.c @@ -569,7 +569,7 @@ uprv_aestrncpy(uint8_t *dst, const uint8_t *src, int32_t n) uint8_t *orig_dst = dst; if(n==-1) { - n = uprv_strlen((const char*)src)+1; /* copy NUL */ + n = (int32_t)uprv_strlen((const char*)src)+1; /* copy NUL */ } /* copy non-null */ while(*src && n>0) { @@ -590,7 +590,7 @@ uprv_eastrncpy(uint8_t *dst, const uint8_t *src, int32_t n) uint8_t *orig_dst = dst; if(n==-1) { - n = uprv_strlen((const char*)src)+1; /* copy NUL */ + n = (int32_t)uprv_strlen((const char*)src)+1; /* copy NUL */ } /* copy non-null */ while(*src && n>0) { diff --git a/src/core/basetypes/icu-ucsdet/ustring.cpp b/src/core/basetypes/icu-ucsdet/ustring.cpp index 40d23c06..d5d748fc 100644 --- a/src/core/basetypes/icu-ucsdet/ustring.cpp +++ b/src/core/basetypes/icu-ucsdet/ustring.cpp @@ -997,7 +997,7 @@ u_strlen(const UChar *s) while(*t != 0) { ++t; } - return t - s; + return (int32_t)(t - s); #endif } |