Merge from trunk:

* Do not treat critcal errors as bad_lexical_cast exceptions, but if exceptions are on, throw correct exception instead (refs #8966)

[SVN r85331]
This commit is contained in:
Antony Polukhin
2013-08-13 13:08:37 +00:00
parent 7e484c17f6
commit 4ba64ea889
2 changed files with 24 additions and 2 deletions
+4 -2
View File
@@ -222,7 +222,8 @@ static void testing_template_array_output_on_char_value()
BOOST_CHECK(&res3[0] == u16ethalon);
}
BOOST_CHECK_THROW(lexical_cast<u16short_arr_type>(val), boost::bad_lexical_cast);
// Some compillers may throw std::bad_alloc here
BOOST_CHECK_THROW(lexical_cast<u16short_arr_type>(val), std::exception);
#endif
#ifdef BOOST_LC_RUNU32
@@ -248,7 +249,8 @@ static void testing_template_array_output_on_char_value()
BOOST_CHECK(&res3[0] == u32ethalon);
}
BOOST_CHECK_THROW(lexical_cast<u32short_arr_type>(val), boost::bad_lexical_cast);
// Some compillers may throw std::bad_alloc here
BOOST_CHECK_THROW(lexical_cast<u32short_arr_type>(val), std::exception);
#endif
}