[mlpack-git] master: Deal with newer Boost versions nicely. (7e682d5)

gitdub at big.cc.gt.atl.ga.us gitdub at big.cc.gt.atl.ga.us
Tue Sep 29 09:33:18 EDT 2015


Repository : https://github.com/mlpack/mlpack

On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/cbeb3ea17262b7c5115247dc217e316c529249b7...f85a9b22f3ce56143943a2488c05c2810d6b2bf3

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

commit 7e682d53a3af417fa0ed0ccf25c13a4daf5a1b40
Author: Ryan Curtin <ryan at ratml.org>
Date:   Fri Sep 25 08:51:27 2015 -0400

    Deal with newer Boost versions nicely.


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

7e682d53a3af417fa0ed0ccf25c13a4daf5a1b40
 src/mlpack/prereqs.hpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/mlpack/prereqs.hpp b/src/mlpack/prereqs.hpp
index a05ae13..b13366f 100644
--- a/src/mlpack/prereqs.hpp
+++ b/src/mlpack/prereqs.hpp
@@ -49,6 +49,11 @@
 // We'll need the necessary boost::serialization features, as well as what we
 // use with mlpack.
 #include <boost/serialization/serialization.hpp>
+// Boost 1.59 and newer don't use BOOST_PFTO, but our shims do.  We can resolve
+// any issue by setting BOOST_PFTO to nothing.
+#ifndef BOOST_PFTO
+  #define BOOST_PFTO
+#endif
 #include <mlpack/core/data/serialization_shim.hpp>
 
 // Now include Armadillo through the special mlpack extensions.



More information about the mlpack-git mailing list