Merge lp:~paul-lucas/zorba/bug-855571 into lp:zorba

[Paul J. Lucas]

Added cast to silence warning.

Added cast to silence warning.

[Gabriel Petrovay (gabipetrovay)]

Something went wrong because I see no diff in the e-mail and online the "Diff" in the lp:~paul-lucas/zorba/bug-855571 branch under "Branch merges" says also 0 lines.

Did you push all the local changes to thins branch?

I am comparing with another branch: https://code.launchpad.net/~gabipetrovay/zorba/curl_dll_fix
and it's merge proposal: https://code.launchpad.net/~gabipetrovay/zorba/curl_dll_fix/+merge/76978

review: Needs Fixing

[lp:~paul-lucas/zorba/bug-855571]

10470. By Paul J. Lucas on 2011-09-24

Added cast to silence warning.

10471. By Paul J. Lucas on 2011-09-28

Merged from trunk.

[Gabriel Petrovay (gabipetrovay)]

Yes I see the changes and it fixed the warning.

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-855571-2011-09-29T12-21-26.246Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-855571-2011-09-29T12-21-26.246Z is finished. The final status was:

All tests succeeded!

=== modified file 'src/zorbatypes/floatimpl.h'
--- src/zorbatypes/floatimpl.h	2011-08-22 15:14:14 +0000
+++ src/zorbatypes/floatimpl.h	2011-09-28 01:39:27 +0000
@@ -330,15 +330,13 @@
 template<typename FloatType>
 template<typename FloatType2>
 inline FloatImpl<FloatType>::FloatImpl( FloatImpl<FloatType2> const &f ) :
-  value_( f.value_ ),
-  precision_( max_precision() )
+  value_( static_cast<value_type>( f.value_ ) ), precision_( max_precision() )
 {
 }
 
 template<typename FloatType>
 inline FloatImpl<FloatType>::FloatImpl( value_type v, precision_type p ) :
-  value_( v ),
-  precision_( p )
+  value_( v ), precision_( p )
 {
 }