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

Proposed by Paul J. Lucas on 2011-09-24
Status: Merged
Approved by: Paul J. Lucas on 2011-09-29
Approved revision: 10471
Merged at revision: 10479
Proposed branch: lp:~paul-lucas/zorba/bug-855571
Merge into: lp:zorba
Diff against target: 20 lines (+2/-4)
1 file modified
src/zorbatypes/floatimpl.h (+2/-4)
To merge this branch: bzr merge lp:~paul-lucas/zorba/bug-855571
Reviewer Review Type Date Requested Status
Gabriel Petrovay (community) 2011-09-24 Approve on 2011-09-29
Review via email: mp+76831@code.launchpad.net

Commit message

Added cast to silence warning.

Description of the change

Added cast to silence warning.

To post a comment you must log in.
Gabriel Petrovay (gabipetrovay) wrote :

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 updated on 2011-09-28
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) wrote :

Yes I see the changes and it fixed the warning.

review: Approve
Zorba Build Bot (zorba-buildbot) wrote :

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

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/zorbatypes/floatimpl.h'
2--- src/zorbatypes/floatimpl.h 2011-08-22 15:14:14 +0000
3+++ src/zorbatypes/floatimpl.h 2011-09-28 01:39:27 +0000
4@@ -330,15 +330,13 @@
5 template<typename FloatType>
6 template<typename FloatType2>
7 inline FloatImpl<FloatType>::FloatImpl( FloatImpl<FloatType2> const &f ) :
8- value_( f.value_ ),
9- precision_( max_precision() )
10+ value_( static_cast<value_type>( f.value_ ) ), precision_( max_precision() )
11 {
12 }
13
14 template<typename FloatType>
15 inline FloatImpl<FloatType>::FloatImpl( value_type v, precision_type p ) :
16- value_( v ),
17- precision_( p )
18+ value_( v ), precision_( p )
19 {
20 }
21

Subscribers

People subscribed via source and target branches