[mlpack-git] master: Fix build with newer Boost versions. (2d0fe63)
gitdub at big.cc.gt.atl.ga.us
gitdub at big.cc.gt.atl.ga.us
Wed Dec 23 11:42:09 EST 2015
Repository : https://github.com/mlpack/mlpack
On branch : master
Link : https://github.com/mlpack/mlpack/compare/de9cc4b05069e1fa4793d9355f2f595af5ff45d2...6070527af14296cd99739de6c62666cc5d2a2125
>---------------------------------------------------------------
commit 2d0fe63d25f2249f6f9c46bf140e7b246d7590e7
Author: Ryan Curtin <ryan at ratml.org>
Date: Tue Sep 22 06:51:09 2015 -0700
Fix build with newer Boost versions.
>---------------------------------------------------------------
2d0fe63d25f2249f6f9c46bf140e7b246d7590e7
src/mlpack/prereqs.hpp | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/mlpack/prereqs.hpp b/src/mlpack/prereqs.hpp
index a05ae13..2b6ab06 100644
--- a/src/mlpack/prereqs.hpp
+++ b/src/mlpack/prereqs.hpp
@@ -47,8 +47,13 @@
#endif
// We'll need the necessary boost::serialization features, as well as what we
-// use with mlpack.
+// use with mlpack. In Boost 1.59 and newer, the BOOST_PFTO code is no longer
+// defined, but we still need to define it (as nothing) so that the mlpack
+// serialization shim compiles.
#include <boost/serialization/serialization.hpp>
+#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