FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add an SG_UNUSED macro to SimGear.

Browse Source 
Imitate Q_UNSUED from Qt, and provide a Simgear 'unused var' warning suppression macro. Fix up one place where the previous warning suppression attempt (assigning to self) was still producing a warning under clang.
This commit is contained in:
James Turner 2012-09-16 16:25:11 +01:00
parent 47d88bcfa7
commit 12f85b3d1f
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
simgear/math/SGGeodesy.cxx
View File

@ -21,6 +21,7 @@
#include <cmath>
#include <simgear/sg_inlines.h>
#include <simgear/structure/exception.hxx>
#include <simgear/debug/logstream.hxx>
@ -344,7 +345,8 @@ static int _geo_inverse_wgs_84( double lat1, double lon1, double lat2,
} else if( fabs(cosphi1) < testv ) {
// initial point is polar
int k = _geo_inverse_wgs_84( lat2,lon2,lat1,lon1, az1,az2,s );
k = k; // avoid compiler error since return result is unused
SG_UNUSED(k);
b = *az1; *az1 = *az2; *az2 = b;
return 0;
} else if( fabs(cosphi2) < testv ) {
@ -352,7 +354,8 @@ static int _geo_inverse_wgs_84( double lat1, double lon1, double lat2,
double _lon1 = lon1 + 180.0f;
int k = _geo_inverse_wgs_84( lat1, lon1, lat1, _lon1,
az1, az2, s );
k = k; // avoid compiler error since return result is unused
SG_UNUSED(k);
*s /= 2.0;
*az2 = *az1 + 180.0;
if( *az2 > 360.0 ) *az2 -= 360.0;

3
simgear/sg_inlines.h
View File

@ -100,4 +100,7 @@ inline void SG_NORMALIZE_RANGE( T &val, const T min, const T max ) {
while( val < min ) val += step;
}
// avoid an 'unused parameter' compiler warning.
#define SG_UNUSED(x) (void)x
#endif // _SG_INLINES_H