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

@@ -69,7 +69,7 @@ void complex_float_tests(Float*)
generic_complex_tests(complex(0.5,0));
generic_complex_tests(complex(25,0));
generic_complex_tests(complex(25,0));
generic_complex_tests(complex(-67.5324535,56.23578678));
generic_complex_tests(complex(static_cast<Float>(-67.5324535),static_cast<Float>(56.23578678)));
}
template <class Integer>