Mathias Fröhlich <> writes:
> Please use this one. And I believe, without looking into the code,
> that there are likely more of them ...
please apply the attached patch which uses static_cast:
Index: src/MultiPlayer/tiny_xdr.cxx
===================================================================
RCS file: /var/cvs/FlightGear-0.9/FlightGear/src/MultiPlayer/tiny_xdr.cxx,v
retrieving revision 1.2
diff -u -r1.2 tiny_xdr.cxx
--- src/MultiPlayer/tiny_xdr.cxx 2 Dec 2005 00:10:25 -0000 1.2
+++ src/MultiPlayer/tiny_xdr.cxx 2 Dec 2005 07:12:41 -0000
@@ -122,42 +122,24 @@
xdr_data_t
XDR_encode_float ( const float & f_Val )
{
- xdr_data_t* tmp;
-
- tmp = (xdr_data_t*) &f_Val;
- return (XDR_encode_int32 (*tmp));
+ return (XDR_encode_int32 (static_cast<xdr_data_t>(f_Val)));
}
float
XDR_decode_float ( const xdr_data_t & f_Val )
{
- float* tmp;
- static xdr_data_t dummy;
-
- dummy = XDR_decode_int32 (f_Val);
- tmp = (float*) &dummy;
- return (*tmp);
+ return (static_cast<float> (XDR_decode_int32 (f_Val)));
}
/* double */
xdr_data2_t
XDR_encode_double ( const double & d_Val )
{
- xdr_data2_t* tmp;
-
- tmp = (xdr_data2_t*) &d_Val;
- return (XDR_encode_int64 (*tmp));
+ return (XDR_encode_int64 (static_cast<xdr_data2_t> (d_Val)));
}
double
XDR_decode_double ( const xdr_data2_t & d_Val )
{
- double* tmp;
- static xdr_data2_t dummy;
-
- dummy = XDR_decode_int64 (d_Val);
- tmp = (double*) &dummy;
- return (*tmp);
+ return (static_cast<double> (XDR_decode_int64 (d_Val)));
}
-
-
--alex--
--
| I believe the moment is at hand when, by a paranoiac and active |
| advance of the mind, it will be possible (simultaneously with |
| automatism and other passive states) to systematize confusion |
| and thus to help to discredit completely the world of reality. |
_______________________________________________
Flightgear-devel mailing list
Flightgear-devel@flightgear.org
http://mail.flightgear.org/mailman/listinfo/flightgear-devel
2f585eeea02e2c79d7b1d8c4963bae2d
