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

Some more trivial warning fixes

Browse Source
This commit is contained in:
Torsten Dreyer 2011-12-25 20:28:38 +01:00
parent 82588b0daf
commit 306c58e7ed
6 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
simgear/environment/metar.hxx
View File

@ -101,7 +101,7 @@ public:
inline double getFriction() const { return _friction; } inline double getFriction() const { return _friction; }
inline const char *getFrictionString() const { return _friction_string; } inline const char *getFrictionString() const { return _friction_string; }
inline const char *getComment() const { return _comment; } inline const char *getComment() const { return _comment; }
inline const bool getWindShear() const { return _wind_shear; } inline bool getWindShear() const { return _wind_shear; }
inline const SGMetarVisibility& getMinVisibility() const { return _min_visibility; } inline const SGMetarVisibility& getMinVisibility() const { return _min_visibility; }
inline const SGMetarVisibility& getMaxVisibility() const { return _max_visibility; } inline const SGMetarVisibility& getMaxVisibility() const { return _max_visibility; }
@ -188,7 +188,7 @@ public:
inline const char *getData() const { return _data; } inline const char *getData() const { return _data; }
inline const char *getUnusedData() const { return _m; } inline const char *getUnusedData() const { return _m; }
inline const bool getProxy() const { return _x_proxy; } inline bool getProxy() const { return _x_proxy; }
inline const char *getId() const { return _icao; } inline const char *getId() const { return _icao; }
inline int getYear() const { return _year; } inline int getYear() const { return _year; }
inline int getMonth() const { return _month; } inline int getMonth() const { return _month; }

2
simgear/math/SGBox.hxx
View File

@ -97,7 +97,7 @@ public:
return (_max[0] - _min[0])*(_max[1] - _min[1])*(_max[2] - _min[2]); return (_max[0] - _min[0])*(_max[1] - _min[1])*(_max[2] - _min[2]);
} }
const bool empty() const bool empty() const
{ return !valid(); } { return !valid(); }
bool valid() const bool valid() const

2
simgear/math/sg_random.h
View File

@ -40,7 +40,7 @@ extern "C" {
* Structure to hold MT algorithm state to easily allow independant * Structure to hold MT algorithm state to easily allow independant
* sets of random numbers with different seeds. * sets of random numbers with different seeds.
*/ */
struct {unsigned int array[MT_N]; int index; } typedef mt; typedef struct {unsigned int array[MT_N]; int index; } mt;
/** /**
* Initialize a new MT state with a given seed. * Initialize a new MT state with a given seed.

8
simgear/screen/tr.cxx
View File

@ -408,7 +408,7 @@ void trBeginTile(TRcontext *tr)
{ {
GLint matrixMode; GLint matrixMode;
GLint tileWidth, tileHeight, border; GLint tileWidth, tileHeight, border;
GLdouble left, right, bottom, top; // GLdouble left, right, bottom, top;
if (!tr) if (!tr)
return; return;
@ -459,7 +459,9 @@ void trBeginTile(TRcontext *tr)
glMatrixMode(GL_PROJECTION); glMatrixMode(GL_PROJECTION);
glLoadIdentity(); glLoadIdentity();
// OSGFIXME
/* compute projection parameters */ /* compute projection parameters */
/*
left = tr->Left + (tr->Right - tr->Left) left = tr->Left + (tr->Right - tr->Left)
* (tr->CurrentColumn * tr->TileWidthNB - border) / tr->ImageWidth; * (tr->CurrentColumn * tr->TileWidthNB - border) / tr->ImageWidth;
right = left + (tr->Right - tr->Left) * tileWidth / tr->ImageWidth; right = left + (tr->Right - tr->Left) * tileWidth / tr->ImageWidth;
@ -467,8 +469,8 @@ void trBeginTile(TRcontext *tr)
* (tr->CurrentRow * tr->TileHeightNB - border) / tr->ImageHeight; * (tr->CurrentRow * tr->TileHeightNB - border) / tr->ImageHeight;
top = bottom + (tr->Top - tr->Bottom) * tileHeight / tr->ImageHeight; top = bottom + (tr->Top - tr->Bottom) * tileHeight / tr->ImageHeight;
// OSGFIXME ssgSetFrustum ( left, right, bottom, top, tr->Near, tr->Far );
// ssgSetFrustum ( left, right, bottom, top, tr->Near, tr->Far ); */
/* restore user's matrix mode */ /* restore user's matrix mode */
glMatrixMode( (GLenum)matrixMode ); glMatrixMode( (GLenum)matrixMode );

2
simgear/xml/xmlparse.c
View File

@ -911,7 +911,7 @@ void XML_DefaultCurrent(XML_Parser parser)
} }
} }
const XML_LChar *XML_ErrorString(int code) const XML_LChar *XML_ErrorString(size_t code)
{ {
static const XML_LChar *message[] = { static const XML_LChar *message[] = {
0, 0,

2
simgear/xml/xmlparse.h
View File

@ -473,7 +473,7 @@ void XMLPARSEAPI
XML_ParserFree(XML_Parser parser); XML_ParserFree(XML_Parser parser);
/* Returns a string describing the error. */ /* Returns a string describing the error. */
const XML_LChar XMLPARSEAPI *XML_ErrorString(int code); const XML_LChar XMLPARSEAPI *XML_ErrorString(size_t code);
#ifdef __cplusplus #ifdef __cplusplus
} }