On 15.02.2011 13:41, Tim Moore wrote:
> I've checked in fixes for this change in osgDB:DatabasePager to the
> SimGear and FlightGear next and releases/2.2.0 branches.
Still doesn't compile with OSG <= 2.8.5. We also need the patch that
Bertrand sent yesterday, i.e. the "#ifdef" logic for the
"_readerWriterOptions" attribute is still incorrect (inverted):
diff --git a/simgear/scene/model/SGPagedLOD.hxx
b/simgear/scene/model/SGPagedLOD.hxx
index a9e55d9..4e25931 100644
--- a/simgear/scene/model/SGPagedLOD.hxx
+++ b/simgear/scene/model/SGPagedLOD.hxx
@@ -72,7 +72,7 @@ public:
protected:
virtual ~SGPagedLOD();
-#if SG_PAGEDLOD_HAS_OPTIONS
+#if !SG_PAGEDLOD_HAS_OPTIONS
osg::ref_ptr<osgDB::ReaderWriter::Options> _readerWriterOptions;
#endif
};
=> Fixes the compile for any OSG version without
"SG_PAGEDLOD_HAS_OPTIONS" support.
> By the way, I committed the changes to releases/2.2.0 and then merged
> that branch into next. This is the way fixes should move between the
> two branches. Please don't commit a fix to next and then cherry-pick
> it to the release branch. It is very messy to have the same change
> committed on several different branches.
Hmm. On the other hand this means applying all (experimental) patches to
the stable release/2.2 branch first.
I'm not a git expert, but generally I like the opposite approach of
applying patches to a project's experimental ("master" / "next" / ... )
branch first. And only after the patch proved to be ok and stable for
everyone, eventually move it to the stable release branch. Reduces the
risk of (temporarily) breaking a release branch (like we did now :) ).
cheers,
Thorsten
------------------------------------------------------------------------------
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
_______________________________________________
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel
