From 6d53abd5afb11b7222fd0a5c61aba518c1f58eef Mon Sep 17 00:00:00 2001 From: torsten Date: Thu, 20 Aug 2009 13:08:03 +0000 Subject: [PATCH] warning fix: initializing members in the order they are declared keeps gcc happy --- simgear/scene/model/CheckSceneryVisitor.cxx | 2 +- simgear/scene/sky/cloudfield.cxx | 4 ++-- simgear/scene/tgdb/TileEntry.cxx | 4 ++-- simgear/scene/tgdb/TreeBin.cxx | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/simgear/scene/model/CheckSceneryVisitor.cxx b/simgear/scene/model/CheckSceneryVisitor.cxx index 56a02368..7d774cfa 100644 --- a/simgear/scene/model/CheckSceneryVisitor.cxx +++ b/simgear/scene/model/CheckSceneryVisitor.cxx @@ -32,7 +32,7 @@ using namespace simgear; CheckSceneryVisitor::CheckSceneryVisitor(osgDB::DatabasePager* dbp, osg::Vec3 &position, double range) :osg::NodeVisitor(osg::NodeVisitor::NODE_VISITOR, osg::NodeVisitor::TRAVERSE_ACTIVE_CHILDREN), -_loaded(true), _position(position), _range(range), _dbp(dbp) +_position(position), _range(range), _loaded(true), _dbp(dbp) { _viewMatrices.push_back(osg::Matrix::identity()); } diff --git a/simgear/scene/sky/cloudfield.cxx b/simgear/scene/sky/cloudfield.cxx index e8614428..7ecd4292 100644 --- a/simgear/scene/sky/cloudfield.cxx +++ b/simgear/scene/sky/cloudfield.cxx @@ -151,8 +151,8 @@ SGCloudField::SGCloudField() : last_course(0.0), last_coverage(0.0), coverage(0.0), - defined3D(false), - reposition_count(0) + reposition_count(0), + defined3D(false) { cld_pos = SGGeoc(); field_root->addChild(field_transform.get()); diff --git a/simgear/scene/tgdb/TileEntry.cxx b/simgear/scene/tgdb/TileEntry.cxx index d49925c2..ec93abc0 100644 --- a/simgear/scene/tgdb/TileEntry.cxx +++ b/simgear/scene/tgdb/TileEntry.cxx @@ -114,9 +114,9 @@ void TileEntry::set_timestamp(double time_ms) // Constructor TileEntry::TileEntry ( const SGBucket& b ) : tile_bucket( b ), + tileFileName(b.gen_index_str()), _node( new osg::LOD ), - is_inner_ring(false), - tileFileName(b.gen_index_str()) + is_inner_ring(false) { _node->setCullCallback(new TileCullCallback); tileFileName += ".stg"; diff --git a/simgear/scene/tgdb/TreeBin.cxx b/simgear/scene/tgdb/TreeBin.cxx index 6a74b92f..c531d0ed 100644 --- a/simgear/scene/tgdb/TreeBin.cxx +++ b/simgear/scene/tgdb/TreeBin.cxx @@ -180,10 +180,10 @@ namespace struct MakeTreesLeaf { MakeTreesLeaf(float range, Geometry* geometry, int varieties) : - _range(range), _geometry(geometry), _varieties(varieties) + _range(range), _varieties(varieties), _geometry(geometry) {} MakeTreesLeaf(const MakeTreesLeaf& rhs) : - _range(rhs._range), _geometry(rhs._geometry), _varieties(rhs._varieties) {} + _range(rhs._range), _varieties(rhs._varieties), _geometry(rhs._geometry) {} LOD* operator() () const { LOD* result = new LOD; -- 2.39.5