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

Minor update of lexical cast before fixing mingw issues (refs #9046)

Browse Source 
[SVN r85830]
This commit is contained in:
Antony Polukhin
2013-09-22 16:06:45 +00:00
parent c2c4b884fe
commit ce7a54af7f
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/boost/lexical_cast.hpp
View File

@@ -1524,7 +1524,7 @@ namespace boost {
return true; return true;
} }
bool const result = shl_real_type(val, buffer, tmp_finish); bool const result = shl_real_type(val, static_cast<CharT*>(buffer), tmp_finish);
finish = tmp_finish; finish = tmp_finish;
return result; return result;
} }
@@ -2085,12 +2085,14 @@ namespace boost {
Target result; Target result;
i_interpreter_type i_interpreter; i_interpreter_type i_interpreter;
if (! (i_interpreter.operator <<(arg)))
BOOST_LCAST_THROW_BAD_CAST(Source, Target); // Disabling ADL, by directly specifying operators.
const bool input_ok = (i_interpreter.operator <<(arg));
o_interpreter_type out(i_interpreter.cbegin(), i_interpreter.cend()); o_interpreter_type out(i_interpreter.cbegin(), i_interpreter.cend());
// Disabling ADL, by directly specifying operators. // Disabling ADL, by directly specifying operators.
if(!(out.operator >>(result))) if(!input_ok || !(out.operator >>(result)))
BOOST_LCAST_THROW_BAD_CAST(Source, Target); BOOST_LCAST_THROW_BAD_CAST(Source, Target);
return result; return result;