--warnings

diff --git a/simgear/props/props.cxx b/simgear/props/props.cxx
index 322a09cdd24d9a3e52ab1d9aff0a781be23324c6..722dfee93b2b3e91b5e961a730a280a71c528dec 100644 (file)
--- a/simgear/props/props.cxx
+++ b/simgear/props/props.cxx
@@ -911,7 +911,7 @@ SGPropertyNode_ptr
 SGPropertyNode::removeChild (int pos, bool keep)
 {
   SGPropertyNode_ptr node;
-  if (pos < 0 || pos >= _children.size())
+  if (pos < 0 || pos >= (int)_children.size())
     return node;
 
   vector<SGPropertyNode_ptr>::iterator it = _children.begin();

diff --git a/simgear/props/props.hxx b/simgear/props/props.hxx
index 332d47a29ad276facbbd61f5c6fb5148279f52c4..7c38fcb14b755851029eb115da0551cc733d448c 100644 (file)
--- a/simgear/props/props.hxx
+++ b/simgear/props/props.hxx
@@ -1185,9 +1185,9 @@ private:
 
   class hash_table;
 
+  int _index;
   string _name;
   mutable string _display_name;
-  int _index;
   /// To avoid cyclic reference counting loops this shall not be a reference
   /// counted pointer
   SGPropertyNode * _parent;

diff --git a/simgear/scene/model/shadowvolume.cxx b/simgear/scene/model/shadowvolume.cxx
index 82f5a751057c4100a544f1fb0d47a00aba1f3233..cd32bf5d7f370b6575dc0bf3859f88aa540ae1a2 100644 (file)
--- a/simgear/scene/model/shadowvolume.cxx
+++ b/simgear/scene/model/shadowvolume.cxx
@@ -905,7 +905,6 @@ void SGShadowVolume::deleteOccluderFromTile(ssgBranch *tile) {
 }
 
 void SGShadowVolume::deleteOccluder(ssgBranch *occluder) {
-       ssgBranch *branch = occluder;
        // skip first node and go to first transform (placement)
        while( occluder && !occluder->isA(ssgTypeTransform()))
                occluder = (ssgBranch *) occluder->getKid(0);
@@ -919,9 +918,6 @@ void SGShadowVolume::deleteOccluder(ssgBranch *occluder) {
 }
 
 void SGShadowVolume::addOccluder(ssgBranch *occluder, OccluderType occluder_type, ssgBranch *tile) {
-
-       ssgBranch *branch = occluder;
-
        // skip first node and go to first transform (placement)
        while( occluder && !occluder->isA(ssgTypeTransform()))
                occluder = (ssgBranch *) occluder->getKid(0);

diff --git a/simgear/scene/sky/bbcache.cxx b/simgear/scene/sky/bbcache.cxx
index 66ba246d4caa660a934719c2a6516c0afca47411..26980d1e84c2d0e6bf9f34437012bf615e556b4a 100644 (file)
--- a/simgear/scene/sky/bbcache.cxx
+++ b/simgear/scene/sky/bbcache.cxx
@@ -91,12 +91,12 @@ bool SGBbCache::allocTextureMemory(int cacheCount, int textureDimension) {
 
 SGBbCache::SGBbCache(void) :
        bbListCount(0),
-       cacheSizeKb(0),
        textureWH(0),
+       cacheSizeKb(0),
        builtBBCount(0),
+       frameNumber(0),
        rt(0),
        rtAvailable(false),
-       frameNumber(0),
        maxImpostorRegenFrame(20)
 {
 }