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

Fixes #5783

Browse Source 
Fixes ambiguities with operators >> and <<. Adds tests for such cases.

[SVN r73818]
This commit is contained in:
Antony Polukhin
2011-08-16 17:09:25 +00:00
parent eb66b40e67
commit 2f5d0c847b
2 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/boost/lexical_cast.hpp
View File

@@ -1687,7 +1687,8 @@ namespace boost
interpreter(buf, buf + src_len);
Target result;
if(!(interpreter << arg && interpreter >> result))
// Disabling ADL, by directly specifying operators.
if(!(interpreter.operator <<(arg) && interpreter.operator >>(result)))
BOOST_LCAST_THROW_BAD_CAST(Source, Target);
return result;
}

28
lexical_cast_test.cpp
View File

@@ -99,6 +99,7 @@ void test_allocator();
void test_wallocator();
#endif
void test_char_types_conversions();
void operators_overload_test();
unit_test::test_suite *init_unit_test_suite(int, char *[])
{
@@ -140,6 +141,7 @@ unit_test::test_suite *init_unit_test_suite(int, char *[])
#endif
suite->add(BOOST_TEST_CASE(&test_char_types_conversions));
suite->add(BOOST_TEST_CASE(&operators_overload_test));
return suite;
}
@@ -958,7 +960,33 @@ void test_char_types_conversions()
struct foo_operators_test
{
foo_operators_test() : f(2) {}
int f;
};
template <typename OStream>
OStream& operator<<(OStream& ostr, const foo_operators_test& foo)
{
ostr << foo.f;
return ostr;
}
template <typename IStream>
IStream& operator>>(IStream& istr, foo_operators_test& foo)
{
istr >> foo.f;
return istr;
}
void operators_overload_test()
{
foo_operators_test foo;
BOOST_CHECK_EQUAL(boost::lexical_cast<std::string>(foo), "2");
BOOST_CHECK_EQUAL((boost::lexical_cast<foo_operators_test>("2")).f, 2);
// Must compile
(void)boost::lexical_cast<foo_operators_test>(foo);
}