From 688cffb031aef47afc3aa05717caf0cce20b77f6 Mon Sep 17 00:00:00 2001 From: mfranz Date: Tue, 14 Mar 2006 15:55:24 +0000 Subject: [PATCH] --warnings --- simgear/props/props.cxx | 2 +- simgear/props/props.hxx | 2 +- simgear/scene/model/shadowvolume.cxx | 4 ---- simgear/scene/sky/bbcache.cxx | 4 ++-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/simgear/props/props.cxx b/simgear/props/props.cxx index 322a09cd..722dfee9 100644 --- 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::iterator it = _children.begin(); diff --git a/simgear/props/props.hxx b/simgear/props/props.hxx index 332d47a2..7c38fcb1 100644 --- 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 82f5a751..cd32bf5d 100644 --- 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 66ba246d..26980d1e 100644 --- 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) { } -- 2.39.5