On Thu, 2009-11-26 at 19:55 +0000, Martin Spott wrote: > Tim Moore wrote: > > Update of /var/cvs/SimGear-0.3/source/simgear/scene/material > > In directory baron.flightgear.org:/tmp/cvs-serv21713/simgear/scene/material > > > > Modified Files: > > Effect.cxx > > Log Message: > [...] > > +#include <boost/tr1/unordered_map.hpp> > > .... requiring to add yet another patch to the build procedure :-/ > > Martin. Hi Tim,
As Martin says, this now requires another patch to use boost 1.34, but the patch is to only comment out this additional #include, since Effect.hxx is already included, which includes 'unordered_map'... My Patches: ~/fg/fg7/simgear/source$ cvs diff [snip] Index: simgear/scene/material/Effect.cxx =================================================================== RCS file: /var/cvs/SimGear-0.3/source/simgear/scene/material/Effect.cxx,v retrieving revision 1.29 diff -r1.29 Effect.cxx 33c33 < #include <boost/tr1/unordered_map.hpp> --- > // #include <boost/tr1/unordered_map.hpp> Index: simgear/scene/material/Effect.hxx =================================================================== RCS file: /var/cvs/SimGear-0.3/source/simgear/scene/material/Effect.hxx,v retrieving revision 1.9 diff -r1.9 Effect.hxx 22,23c22,27 < #include <boost/tr1/unordered_map.hpp> < --- > #include <boost/version.hpp> > #if BOOST_VERSION > 103401 > #include <boost/tr1/unordered_map.hpp> > #else > #include <tr1/unordered_map> // for <c++/4.2/tr1/unordered_map> > #endif [snip] You have left/returned configure.ac to - AX_BOOST_BASE([1.34.0]) Thanks for this... I hope you will apply the above... Regards, Geoff. ------------------------------------------------------------------------------ Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day trial. Simplify your report design, integration and deployment - and focus on what you do best, core application coding. Discover what's new with Crystal Reports now. http://p.sf.net/sfu/bobj-july _______________________________________________ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
