feedc0de/boost_detail
1
0
Fork 0
forked from boostorg/detail
Code Pull Requests Activity

detail/utf8_codecvt_facet.cpp: apply patch from ticket #2986 to quiet warnings when wchar_t is 16-bits.

Browse Source 
[SVN r53459]
This commit is contained in:
Beman Dawes
2009-05-30 14:57:49 +00:00
parent cad13ace57
commit 8c3a497ec8
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
utf8_codecvt_facet.cpp
View File

@@ -231,9 +231,6 @@ int get_cont_octet_out_count_impl(wchar_t word){
return 2; return 2;
} }
// note the following code will generate on some platforms where
// wchar_t is defined as UCS2. The warnings are superfluous as
// the specialization is never instantitiated with such compilers.
template<> template<>
int get_cont_octet_out_count_impl<4>(wchar_t word){ int get_cont_octet_out_count_impl<4>(wchar_t word){
if (word < 0x80) { if (word < 0x80) {
@@ -242,7 +239,19 @@ int get_cont_octet_out_count_impl<4>(wchar_t word){
if (word < 0x800) { if (word < 0x800) {
return 1; return 1;
} }
if (word < 0x10000) {
// Note that the following code will generate warnings on some platforms
// where wchar_t is defined as UCS2. The warnings are superfluous as the
// specialization is never instantitiated with such compilers, but this
// can cause problems if warnings are being treated as errors, so we guard
// against that. Including <boost/detail/utf8_codecvt_facet.hpp> as we do
// should be enough to get WCHAR_MAX defined.
#if !defined(WCHAR_MAX)
# error WCHAR_MAX not defined!
#endif
#if WCHAR_MAX > 0x10000
if (word < 0x10000) {
return 2; return 2;
} }
if (word < 0x200000) { if (word < 0x200000) {
@@ -252,6 +261,10 @@ int get_cont_octet_out_count_impl<4>(wchar_t word){
return 4; return 4;
} }
return 5; return 5;
#else
return 2;
#endif
} }
} // namespace anonymous } // namespace anonymous