feedc0de/boost_conversion
1
0
Fork 0
forked from boostorg/conversion
Code Pull Requests Activity

Fixed as many -Wconversion warnings in lexical cast and tests as possible (refs #2558)

Browse Source 
[SVN r82695]
This commit is contained in:
Antony Polukhin
2013-02-03 09:20:28 +00:00
parent 3e4a1669f1
commit 5c8c897d30
3 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
include/boost/lexical_cast.hpp
View File

@@ -838,7 +838,7 @@ namespace boost {
if(group < grouping_size) if(group < grouping_size)
{ {
char const grp_size = grouping[group]; char const grp_size = grouping[group];
last_grp_size = grp_size <= 0 ? CHAR_MAX : grp_size; last_grp_size = grp_size <= 0 ? static_cast<char>(CHAR_MAX) : grp_size;
} }
left = last_grp_size; left = last_grp_size;
@@ -886,7 +886,7 @@ namespace boost {
if (begin > end || *end < czero || *end >= czero + 10) if (begin > end || *end < czero || *end >= czero + 10)
return false; return false;
value = *end - czero; value = static_cast<T>(*end - czero);
--end; --end;
T multiplier = 1; T multiplier = 1;
bool multiplier_overflowed = false; bool multiplier_overflowed = false;
@@ -906,17 +906,17 @@ namespace boost {
{ {
unsigned char current_grouping = 0; unsigned char current_grouping = 0;
CharT const thousands_sep = np.thousands_sep(); CharT const thousands_sep = np.thousands_sep();
char remained = grouping[current_grouping] - 1; char remained = static_cast<char>(grouping[current_grouping] - 1);
bool shall_we_return = true; bool shall_we_return = true;
for(;end>=begin; --end) for(;end>=begin; --end)
{ {
if (remained) { if (remained) {
T const multiplier_10 = multiplier * 10; T const multiplier_10 = static_cast<T>(multiplier * 10);
if (multiplier_10 / 10 != multiplier) multiplier_overflowed = true; if (multiplier_10 / 10 != multiplier) multiplier_overflowed = true;
T const dig_value = *end - czero; T const dig_value = static_cast<T>(*end - czero);
T const new_sub_value = multiplier_10 * dig_value; T const new_sub_value = static_cast<T>(multiplier_10 * dig_value);
if (*end < czero || *end >= czero + 10 if (*end < czero || *end >= czero + 10
/* detecting overflow */ /* detecting overflow */
@@ -926,8 +926,8 @@ namespace boost {
) )
return false; return false;
value += new_sub_value; value = static_cast<T>(value + new_sub_value);
multiplier *= 10; multiplier = static_cast<T>(multiplier * 10);
--remained; --remained;
} else { } else {
if ( !Traits::eq(*end, thousands_sep) ) //|| begin == end ) return false; if ( !Traits::eq(*end, thousands_sep) ) //|| begin == end ) return false;
@@ -960,11 +960,11 @@ namespace boost {
{ {
while ( begin <= end ) while ( begin <= end )
{ {
T const multiplier_10 = multiplier * 10; T const multiplier_10 = static_cast<T>(multiplier * 10);
if (multiplier_10 / 10 != multiplier) multiplier_overflowed = true; if (multiplier_10 / 10 != multiplier) multiplier_overflowed = true;
T const dig_value = *end - czero; T const dig_value = static_cast<T>(*end - czero);
T const new_sub_value = multiplier_10 * dig_value; T const new_sub_value = static_cast<T>(multiplier_10 * dig_value);
if (*end < czero || *end >= czero + 10 if (*end < czero || *end >= czero + 10
/* detecting overflow */ /* detecting overflow */
@@ -974,8 +974,8 @@ namespace boost {
) )
return false; return false;
value += new_sub_value; value = static_cast<T>(value + new_sub_value);
multiplier *= 10; multiplier = static_cast<T>(multiplier * 10);
--end; --end;
} }
} }
@@ -1192,7 +1192,7 @@ namespace boost {
: np.grouping() : np.grouping()
); );
std::string::size_type const grouping_size = grouping.size(); std::string::size_type const grouping_size = grouping.size();
CharT const thousands_sep = grouping_size ? np.thousands_sep() : 0; CharT const thousands_sep = static_cast<CharT>(grouping_size ? np.thousands_sep() : 0);
CharT const decimal_point = np.decimal_point(); CharT const decimal_point = np.decimal_point();
bool found_grouping = false; bool found_grouping = false;
std::string::size_type last_grouping_pos = grouping_size - 1; std::string::size_type last_grouping_pos = grouping_size - 1;
@@ -2350,7 +2350,7 @@ namespace boost {
> converter_t; > converter_t;
return ( return (
arg < 0 ? 0u - converter_t::convert(0u - arg) : converter_t::convert(arg) arg < 0 ? static_cast<Target>(0u - converter_t::convert(0u - arg)) : converter_t::convert(arg)
); );
} }
}; };

2
numeric_cast_test.cpp
View File

@@ -48,7 +48,7 @@ int test_main( int , char * [] )
long large_negative_value = LONG_MIN; long large_negative_value = LONG_MIN;
signed char c = 0; signed char c = 0;
c = large_value; // see if compiler generates warning c = static_cast<signed char>(large_value);
c = numeric_cast<signed char>( small_value ); c = numeric_cast<signed char>( small_value );
BOOST_CHECK( c == 1 ); BOOST_CHECK( c == 1 );

4
test/lexical_cast_vc8_bug_test.cpp
View File

@@ -34,7 +34,7 @@ void test_too_long_number(CharT zero)
o << (limits::max)() << zero; o << (limits::max)() << zero;
s = o.str(); s = o.str();
BOOST_CHECK_THROW(lexical_cast<T>(s), bad_lexical_cast); BOOST_CHECK_THROW(lexical_cast<T>(s), bad_lexical_cast);
s[s.size()-1] += 9; // '0' -> '9' s[s.size()-1] += static_cast<CharT>(9); // '0' -> '9'
BOOST_CHECK_THROW(lexical_cast<T>(s), bad_lexical_cast); BOOST_CHECK_THROW(lexical_cast<T>(s), bad_lexical_cast);
if(limits::is_signed) if(limits::is_signed)
@@ -43,7 +43,7 @@ void test_too_long_number(CharT zero)
o << (limits::min)() << zero; o << (limits::min)() << zero;
s = o.str(); s = o.str();
BOOST_CHECK_THROW(lexical_cast<T>(s), bad_lexical_cast); BOOST_CHECK_THROW(lexical_cast<T>(s), bad_lexical_cast);
s[s.size()-1] += 9; // '0' -> '9' s[s.size()-1] += static_cast<CharT>(9); // '0' -> '9'
BOOST_CHECK_THROW(lexical_cast<T>(s), bad_lexical_cast); BOOST_CHECK_THROW(lexical_cast<T>(s), bad_lexical_cast);
} }
} }