[Gearbox-commit] SF.net SVN: gearbox:[327] gearbox/trunk/src

[<rus...@us...>]

Revision: 327
          http://gearbox.svn.sourceforge.net/gearbox/?rev=327&view=rev
Author:   russo2503v
Date:     2008-10-19 13:04:44 +0000 (Sun, 19 Oct 2008)

Log Message:
-----------
fixing conversion warnings

Modified Paths:
--------------
    gearbox/trunk/src/gbxgarminacfr/nmea.cpp
    gearbox/trunk/src/gbxutilacfr/test/mathtest.cpp

Modified: gearbox/trunk/src/gbxgarminacfr/nmea.cpp
===================================================================
--- gearbox/trunk/src/gbxgarminacfr/nmea.cpp	2008-10-16 08:57:34 UTC (rev 326)
+++ gearbox/trunk/src/gbxgarminacfr/nmea.cpp	2008-10-19 13:04:44 UTC (rev 327)
@@ -130,8 +130,8 @@
    
     //save the high and low bytes of the checksum
     //Make sure they are in upper case!
-    chksum_HIB = toupper(*(++ptr));  
-    chksum_LOB = toupper(*(ptr + 1));
+    chksum_HIB = (char)toupper(*(++ptr));  
+    chksum_LOB = (char)toupper(*(ptr + 1));
    
 
     //invalidate the existing checksum
@@ -189,6 +189,10 @@
             break;
         }
     
+        // alexm: gcc-4.3 is very strict with the next line.
+        // not sure what to do about it yet.
+        // http://gcc.gnu.org/ml/gcc/2008-05/msg00363.html
+
         // Keep the running XOR total
         chkRunning ^= nextChar;
     }

Modified: gearbox/trunk/src/gbxutilacfr/test/mathtest.cpp
===================================================================
--- gearbox/trunk/src/gbxutilacfr/test/mathtest.cpp	2008-10-16 08:57:34 UTC (rev 326)
+++ gearbox/trunk/src/gbxutilacfr/test/mathtest.cpp	2008-10-19 13:04:44 UTC (rev 327)
@@ -27,27 +27,27 @@
 {
     T angle;
 
-    angle = -M_PI;
+    angle = (T)(-M_PI);
     NORMALISE_ANGLE(angle);
     assert( angle >= -M_PI && angle < M_PI );
 
-    angle = -M_PI+EPS;
+    angle = -(T)M_PI + (T)EPS;
     NORMALISE_ANGLE(angle);
     assert( angle >= -M_PI && angle < M_PI );
 
-    angle = -M_PI-EPS;
+    angle = -(T)M_PI - (T)EPS;
     NORMALISE_ANGLE(angle);
     assert( angle >= -M_PI && angle < M_PI );
 
-    angle = M_PI;
+    angle = (T)M_PI;
     NORMALISE_ANGLE(angle);
     assert( angle >= -M_PI && angle < M_PI );
 
-    angle = M_PI+EPS;
+    angle = (T)M_PI + (T)EPS;
     NORMALISE_ANGLE(angle);
     assert( angle >= -M_PI && angle < M_PI );
 
-    angle = M_PI-EPS;
+    angle = (T)M_PI - (T)EPS;
     NORMALISE_ANGLE(angle);
     assert( angle >= -M_PI && angle < M_PI );
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.