organicmaps/utfcpp
13
Fork 0
mirror of https://github.com/nemtrif/utfcpp.git synced 2025-04-04 13:05:06 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

Fix Wsign-conversion warnings

Browse source
This commit is contained in:
root 2024-11-02 20:38:03 -04:00
parent cd191b6c45
commit 77870cc80b
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
source/utf8/core.h
View file

@ -215,7 +215,7 @@ namespace internal
UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(it, end) UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(it, end)
code_point += (*it) & 0x3f; code_point = static_cast<utfchar32_t>(code_point + ((*it) & 0x3f));
return UTF8_OK; return UTF8_OK;
} }
@ -234,11 +234,11 @@ namespace internal
UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(it, end) UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(it, end)
code_point += (utf8::internal::mask8(*it) << 6) & 0xfff; code_point = static_cast<utfchar32_t>(code_point + ((utf8::internal::mask8(*it) << 6) & 0xfff));
UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(it, end) UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(it, end)
code_point += (*it) & 0x3f; code_point = static_cast<utfchar32_t>(code_point + ((*it) & 0x3f));
return UTF8_OK; return UTF8_OK;
} }
@ -327,7 +327,7 @@ namespace internal
else if (is_lead_surrogate(first_word)) { else if (is_lead_surrogate(first_word)) {
const utfchar16_t second_word = *it++; const utfchar16_t second_word = *it++;
if (is_trail_surrogate(second_word)) { if (is_trail_surrogate(second_word)) {
code_point = (first_word << 10) + second_word + SURROGATE_OFFSET; code_point = static_cast<utfchar32_t>(first_word << 10) + second_word + SURROGATE_OFFSET;
return UTF8_OK; return UTF8_OK;
} else } else
err = INCOMPLETE_SEQUENCE; err = INCOMPLETE_SEQUENCE;

6
source/utf8/unchecked.h
View file

@ -115,15 +115,15 @@ namespace utf8
++it; ++it;
cp = ((cp << 12) & 0xffff) + ((utf8::internal::mask8(*it) << 6) & 0xfff); cp = ((cp << 12) & 0xffff) + ((utf8::internal::mask8(*it) << 6) & 0xfff);
++it; ++it;
cp += (*it) & 0x3f; cp = static_cast<utfchar32_t>(cp + ((*it) & 0x3f));
break; break;
case 4: case 4:
++it; ++it;
cp = ((cp << 18) & 0x1fffff) + ((utf8::internal::mask8(*it) << 12) & 0x3ffff); cp = ((cp << 18) & 0x1fffff) + ((utf8::internal::mask8(*it) << 12) & 0x3ffff);
++it; ++it;
cp += (utf8::internal::mask8(*it) << 6) & 0xfff; cp = static_cast<utfchar32_t>(cp + ((utf8::internal::mask8(*it) << 6) & 0xfff));
++it; ++it;
cp += (*it) & 0x3f; cp = static_cast<utfchar32_t>(cp + ((*it) & 0x3f));
break; break;
} }
++it; ++it;

2
tests/CMakeLists.txt
View file

@ -11,7 +11,7 @@ if (MSVC)
add_compile_options(/W4) add_compile_options(/W4)
else() else()
# additional warnings # additional warnings
add_compile_options(-Wall -Wextra -Wpedantic -Wconversion) add_compile_options(-Wall -Wextra -Wpedantic -Wconversion -Wsign-conversion)
endif() endif()
add_executable(negative negative.cpp) add_executable(negative negative.cpp)