Drop required Boost version from 1.37 to 1.34

Use boost/tr1 to bring in std::tr1::unordered_map instead of the Boost
version.

diff --git a/acinclude.m4 b/acinclude.m4
index af9004cb45e72d901eb8d0b3c164bdccfba2c408..9e46179f3b14e05255a5642ee5335c77a0ce2a92 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -671,7 +671,7 @@ if test "x$want_boost" = "xyes"; then
                if test "$_version" = "0" ; then
                        AC_MSG_ERROR([[We could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option.  If you are sure you have boost installed, then check your version number looking in <boost/version.hpp>. See http://randspringer.de/boost for more documentation.]])
                else
-                       AC_MSG_NOTICE([Your boost libraries seems to old (version $_version).])
+                       AC_MSG_ERROR([Your boost libraries seems to old (version $_version).])
                fi
        else
                AC_SUBST(BOOST_CPPFLAGS)

diff --git a/configure.ac b/configure.ac
index 3e18ea0a179d8610f784d5a0d01cb4fac1473aa9..716cd68a1603e90006f885e758deeda74a69c765 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -37,7 +37,7 @@ AC_PROG_CXX
 AC_PROG_RANLIB
 AC_PROG_INSTALL
 AC_PROG_LN_S
-AX_BOOST_BASE([1.37.0])
+AX_BOOST_BASE([1.34.0])
 
 if test "x$BOOST_CPPFLAGS" != "x-I/usr/include" ; then
    CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"

diff --git a/simgear/scene/material/Effect.hxx b/simgear/scene/material/Effect.hxx
index db5d2b01c06533f0af4de6a3bf3510f76ea6af12..1f33b9e86d61209f7a0b1f6cb5c4a08b7aa64446 100644 (file)
--- a/simgear/scene/material/Effect.hxx
+++ b/simgear/scene/material/Effect.hxx
@@ -19,8 +19,9 @@
 
 #include <vector>
 #include <string>
+#include <boost/tr1/unordered_map.hpp>
 
-#include <boost/unordered_map.hpp>
+#include <boost/functional/hash.hpp>
 
 #include <osg/Object>
 #include <osgDB/ReaderWriter>
@@ -132,8 +133,8 @@ protected:
             bool operator()(const Key& lhs, const Key& rhs) const;
         };
     };
-    typedef boost::unordered_map<Key, osg::ref_ptr<Effect>, boost::hash<Key>,
-                                 Key::EqualTo> Cache;
+    typedef std::tr1::unordered_map<Key, osg::ref_ptr<Effect>,
+                                    boost::hash<Key>, Key::EqualTo> Cache;
     Cache* getCache()
     {
         if (!_cache)