boostorg/detail
1
0
Fork 1
mirror of https://github.com/boostorg/detail.git synced 2025-07-31 12:57:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed length calculation and added a test.

Browse Source
This commit is contained in:
Andrey Semashev
2016-08-07 23:35:04 +03:00
parent 6abcc6cd09
commit 94f1e6b0c6
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/boost/detail/utf8_codecvt_facet.ipp
View File

@@ -204,7 +204,7 @@ BOOST_UTF8_DECL int utf8_codecvt_facet::do_length(
last_octet_count = (get_octet_count(*from_next)); last_octet_count = (get_octet_count(*from_next));
++char_count; ++char_count;
} }
return static_cast<int>(from_next-from_end); return static_cast<int>(from_next-from);
} }
BOOST_UTF8_DECL unsigned int utf8_codecvt_facet::get_octet_count( BOOST_UTF8_DECL unsigned int utf8_codecvt_facet::get_octet_count(

12
test/test_utf8_codecvt.cpp
View File

@@ -29,7 +29,7 @@ namespace std{
using ::wcslen; using ::wcslen;
#if !defined(UNDER_CE) && !defined(__PGIC__) #if !defined(UNDER_CE) && !defined(__PGIC__)
using ::w_int; using ::w_int;
#endif #endif
} // namespace std } // namespace std
#endif #endif
@@ -251,6 +251,16 @@ test_main(int /* argc */, char * /* argv */[]) {
) )
); );
} }
// Test length calculation
{
std::codecvt<wchar_t, char, std::mbstate_t> const& fac = std::use_facet< std::codecvt<wchar_t, char, std::mbstate_t> >(utf8_locale);
std::mbstate_t mbs = std::mbstate_t();
const int utf8_len = sizeof(td::utf8_encoding) / sizeof(*td::utf8_encoding);
int res = fac.length(mbs, reinterpret_cast< const char* >(td::utf8_encoding), reinterpret_cast< const char* >(td::utf8_encoding + utf8_len), ~static_cast< std::size_t >(0u));
BOOST_TEST_EQ(utf8_len, res);
}
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }