Merge hash from trunk.

- Avoid `-Wconversion` warnings.


[SVN r67664]
This commit is contained in:
Daniel James
2011-01-04 23:06:53 +00:00
parent 80b88f24c1
commit fc7eb28826
7 changed files with 18 additions and 10 deletions

View File

@@ -113,7 +113,8 @@ void poor_quality_tests(T*)
if(T(1) != T(2))
BOOST_TEST(x1(T(1)) != x2(T(2)));
if((limits::max)() != (limits::max)() - 1)
BOOST_TEST(x1((limits::max)()) != x2((limits::max)() - 1));
BOOST_TEST(x1(static_cast<T>((limits::max)()))
!= x2(static_cast<T>((limits::max)() - 1)));
}
void bool_test()