Some more trivial warning fixes

diff --git a/simgear/environment/metar.hxx b/simgear/environment/metar.hxx
index 26e8523ef21f9ba4cffee641ea83127a43d176bc..2f2e5d0218c08fb1a3a915ebb0c8c9e08fca154d 100644 (file)
--- a/simgear/environment/metar.hxx
+++ b/simgear/environment/metar.hxx
@@ -101,7 +101,7 @@ public:
        inline double                   getFriction()           const { return _friction; }
        inline const char               *getFrictionString()    const { return _friction_string; }
        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& getMaxVisibility()      const { return _max_visibility; }
 
@@ -188,7 +188,7 @@ public:
 
        inline const char *getData()            const { return _data; }
        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 int      getYear()               const { return _year; }
        inline int      getMonth()              const { return _month; }

diff --git a/simgear/math/SGBox.hxx b/simgear/math/SGBox.hxx
index dfa50275b3af0bc95d1036475db3cbad4df4c7d3..f63eef242568f5285fb740c7f8b28f43f6ddeb59 100644 (file)
--- a/simgear/math/SGBox.hxx
+++ b/simgear/math/SGBox.hxx
@@ -97,7 +97,7 @@ public:
     return (_max[0] - _min[0])*(_max[1] - _min[1])*(_max[2] - _min[2]);
   }
 
-  const bool empty() const
+  bool empty() const
   { return !valid(); }
 
   bool valid() const

diff --git a/simgear/math/sg_random.h b/simgear/math/sg_random.h
index 1fed733d3aa5c683d8903177350ab70a0643c126..51fefb65001d71f596af3f62ea1968764fc899c9 100644 (file)
--- a/simgear/math/sg_random.h
+++ b/simgear/math/sg_random.h
@@ -40,7 +40,7 @@ extern "C" {
  * Structure to hold MT algorithm state to easily allow independant
  * 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.

diff --git a/simgear/screen/tr.cxx b/simgear/screen/tr.cxx
index fd64d7cb648357108f5c38aa78075cc3a6705d75..e6d8bd7e3f8cf530882706366579a45570547ae4 100644 (file)
--- a/simgear/screen/tr.cxx
+++ b/simgear/screen/tr.cxx
@@ -408,7 +408,7 @@ void trBeginTile(TRcontext *tr)
 {
    GLint matrixMode;
    GLint tileWidth, tileHeight, border;
-   GLdouble left, right, bottom, top;
+//   GLdouble left, right, bottom, top;
 
    if (!tr)
       return;
@@ -459,7 +459,9 @@ void trBeginTile(TRcontext *tr)
    glMatrixMode(GL_PROJECTION);
    glLoadIdentity();
 
+   // OSGFIXME
    /* compute projection parameters */
+   /*
    left = tr->Left + (tr->Right - tr->Left)
         * (tr->CurrentColumn * tr->TileWidthNB - border) / 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;
    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 */
    glMatrixMode( (GLenum)matrixMode );

diff --git a/simgear/xml/xmlparse.c b/simgear/xml/xmlparse.c
index 294b73b4dd2ebe381f802a3a68655efe48c9792e..c40dce072d5f1ba9512f16262b393b21defd25bf 100644 (file)
--- a/simgear/xml/xmlparse.c
+++ b/simgear/xml/xmlparse.c
@@ -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[] = {
     0,

diff --git a/simgear/xml/xmlparse.h b/simgear/xml/xmlparse.h
index f2f9c9be1c0d69d926dcf22b4e4c58cab8bd0ac9..123afdf9318d34b106f80d7366d9edde6c58dbdc 100644 (file)
--- a/simgear/xml/xmlparse.h
+++ b/simgear/xml/xmlparse.h
@@ -473,7 +473,7 @@ void XMLPARSEAPI
 XML_ParserFree(XML_Parser parser);
 
 /* 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
 }