From 149200f0e9e8ac830869ef4fd6b49b5f701d5b36 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 23 Dec 2010 13:11:15 +0000 Subject: [PATCH] Fixed warnings --- src/osg/NodeVisitor.cpp | 4 ++-- src/osgDB/DatabasePager.cpp | 2 +- src/osgPlugins/3ds/lib3ds/lib3ds_track.c | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/osg/NodeVisitor.cpp b/src/osg/NodeVisitor.cpp index 92bd2e250..085dc2cec 100644 --- a/src/osg/NodeVisitor.cpp +++ b/src/osg/NodeVisitor.cpp @@ -42,7 +42,7 @@ NodeVisitor::NodeVisitor(TraversalMode tm): Referenced(true) { _visitorType = NODE_VISITOR; - _traversalNumber = -1; + _traversalNumber = osg::UNINITIALIZED_FRAME_NUMBER; _traversalMode = tm; _traversalMask = 0xffffffff; @@ -53,7 +53,7 @@ NodeVisitor::NodeVisitor(VisitorType type,TraversalMode tm): Referenced(true) { _visitorType = type; - _traversalNumber = -1; + _traversalNumber = osg::UNINITIALIZED_FRAME_NUMBER; _traversalMode = tm; _traversalMask = 0xffffffff; diff --git a/src/osgDB/DatabasePager.cpp b/src/osgDB/DatabasePager.cpp index 6ec9846e7..9636540c7 100644 --- a/src/osgDB/DatabasePager.cpp +++ b/src/osgDB/DatabasePager.cpp @@ -448,7 +448,7 @@ void DatabasePager::DatabaseRequest::invalidate() // DatabasePager::RequestQueue::RequestQueue(DatabasePager* pager): _pager(pager), - _frameNumberLastPruned(-1) + _frameNumberLastPruned(osg::UNINITIALIZED_FRAME_NUMBER) { } diff --git a/src/osgPlugins/3ds/lib3ds/lib3ds_track.c b/src/osgPlugins/3ds/lib3ds/lib3ds_track.c index 467a0444d..2791aefe6 100644 --- a/src/osgPlugins/3ds/lib3ds/lib3ds_track.c +++ b/src/osgPlugins/3ds/lib3ds/lib3ds_track.c @@ -235,7 +235,7 @@ setup_segment(Lib3dsTrack *track, int index, Lib3dsKey *pp, Lib3dsKey *p0, Lib3d *pp = track->keys[track->nkeys - 2]; pp->frame = track->keys[track->nkeys - 2].frame - (track->keys[track->nkeys - 1].frame - track->keys[0].frame); } - else ip = -1; // Avoids a compiler warning + else ip = -1; // Avoids a compiler warning } *p0 = track->keys[index - 1]; @@ -250,6 +250,7 @@ setup_segment(Lib3dsTrack *track, int index, Lib3dsKey *pp, Lib3dsKey *p0, Lib3d *pn = track->keys[1]; pn->frame = track->keys[1].frame + (track->keys[track->nkeys-1].frame - track->keys[0].frame); } + else in = -1; // Avoids a compiler warning } if (track->type == LIB3DS_TRACK_QUAT) {