[mlpack-git] master: Makes boost_backport.hpp detect boost version (ee69680)

[gitdub at mlpack.org]

Repository : https://github.com/mlpack/mlpack
On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/ba850f782a53c5a77b7985f7647f609bd96cb5e7...2c026d838925df436d967439899813da5d34c702

>---------------------------------------------------------------

commit ee69680e03696c9abde8e722afb5babe6fab9a36
Author: Yannis Mentekidis <mentekid at gmail.com>
Date:   Thu Jul 21 15:57:22 2016 +0100

    Makes boost_backport.hpp detect boost version


>---------------------------------------------------------------

ee69680e03696c9abde8e722afb5babe6fab9a36
 src/mlpack/core/boost_backport/boost_backport.hpp | 21 +++++++++++----------
 src/mlpack/core/dists/gamma_distribution.cpp      |  2 +-
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/mlpack/core/boost_backport/boost_backport.hpp b/src/mlpack/core/boost_backport/boost_backport.hpp
index 7247fa4..d2b12cd 100644
--- a/src/mlpack/core/boost_backport/boost_backport.hpp
+++ b/src/mlpack/core/boost_backport/boost_backport.hpp
@@ -18,21 +18,22 @@
 #ifndef MLPACK_CORE_BOOST_BACKPORT_HPP
 #define MLPACK_CORE_BOOST_BACKPORT_HPP
 
-#if BOOST_VERSION < 105600
-  // Full backport.
-  #include "mlpack/core/boost_backport/unordered_map.hpp"
-  #include "mlpack/core/boost_backport/trigamma.hpp"
-  #include "mlpack/core/boost_backport/polygamma.hpp"
+#include <boost/version.hpp>
 
-#elif BOOST_VERSION < 105800
-  // Backport trigamma and polygamma.
+#if BOOST_VERSION < 105500
+  // Backported unordered_map.
+  #include "mlpack/core/boost_backport/unordered_map.hpp"
+#else
+  // Boost's version
   #include <boost/serialization/unordered_map.hpp>
+#endif
+
+#if BOOST_VERSION < 105800
+  // Backported trigamma and polygamma.
   #include "mlpack/core/boost_backport/trigamma.hpp"
   #include "mlpack/core/boost_backport/polygamma.hpp"
-
 #else
-  // Don't backport anything.
-  #include <boost/serialization/unordered_map.hpp>
+  // Boost's version.
   #include <boost/math/special_functions/trigamma.hpp>
   #include <boost/math/special_functions/polygamma.hpp>
 #endif
diff --git a/src/mlpack/core/dists/gamma_distribution.cpp b/src/mlpack/core/dists/gamma_distribution.cpp
index c6790e0..5de0630 100644
--- a/src/mlpack/core/dists/gamma_distribution.cpp
+++ b/src/mlpack/core/dists/gamma_distribution.cpp
@@ -7,7 +7,7 @@
 #include "gamma_distribution.hpp"
 
 #include <boost/math/special_functions/digamma.hpp>
-#include "mlpack/core/boost_backport/boost_backport.hpp"
+//#include <boost/math/special_functions/trigamma.hpp> // Moved to prereqs.hpp
 
 using namespace mlpack;
 using namespace mlpack::distribution;