diff options
| author | Mattes D <github@xoft.cz> | 2016-08-25 09:04:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-25 09:04:17 +0200 |
| commit | d52afadad491474f63e8184cb5a08c0ca21ab48c (patch) | |
| tree | d5afab6035ca6bb0b58fd03ad5cfe3b3f8e1da55 /src/StringUtils.cpp | |
| parent | Merge pull request #3342 from cuberite/FixEmptyHeader (diff) | |
| parent | Fixed type-casting-related warnings. (diff) | |
| download | cuberite-d52afadad491474f63e8184cb5a08c0ca21ab48c.tar cuberite-d52afadad491474f63e8184cb5a08c0ca21ab48c.tar.gz cuberite-d52afadad491474f63e8184cb5a08c0ca21ab48c.tar.bz2 cuberite-d52afadad491474f63e8184cb5a08c0ca21ab48c.tar.lz cuberite-d52afadad491474f63e8184cb5a08c0ca21ab48c.tar.xz cuberite-d52afadad491474f63e8184cb5a08c0ca21ab48c.tar.zst cuberite-d52afadad491474f63e8184cb5a08c0ca21ab48c.zip | |
Diffstat (limited to 'src/StringUtils.cpp')
| -rw-r--r-- | src/StringUtils.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/StringUtils.cpp b/src/StringUtils.cpp index 8ea94ecd7..521aa79f4 100644 --- a/src/StringUtils.cpp +++ b/src/StringUtils.cpp @@ -558,8 +558,8 @@ std::u16string UTF8ToRawBEUTF16(const AString & a_UTF8) { // target is a character in range 0xFFFF - 0x10FFFF. ch -= halfBase; - unsigned short v1 = htons((ch >> halfShift) + UNI_SUR_HIGH_START); - unsigned short v2 = htons((ch & halfMask) + UNI_SUR_LOW_START); + auto v1 = htons(static_cast<uint16_t>((ch >> halfShift) + UNI_SUR_HIGH_START)); + auto v2 = htons(static_cast<uint16_t>((ch & halfMask) + UNI_SUR_LOW_START)); UTF16.push_back(static_cast<char16_t>(v1)); UTF16.push_back(static_cast<char16_t>(v2)); } |