------------------------------------------------------------
revno: 2987
committer: Anton Gladky <[email protected]>
branch nick: yade
timestamp: Mon 2011-12-19 18:02:15 +0100
message:
Fix compilation with boost >=1.47
modified:
lib/serialization/ObjectIO.hpp
py/wrapper/yadeWrapper.cpp
--
lp:yade
https://code.launchpad.net/~yade-dev/yade/trunk
Your team Yade developers is subscribed to branch lp:yade.
To unsubscribe from this branch go to
https://code.launchpad.net/~yade-dev/yade/trunk/+edit-subscription
=== modified file 'lib/serialization/ObjectIO.hpp'
--- lib/serialization/ObjectIO.hpp 2010-07-24 18:10:24 +0000
+++ lib/serialization/ObjectIO.hpp 2011-12-19 17:02:15 +0000
@@ -9,8 +9,15 @@
#include<boost/iostreams/filter/gzip.hpp>
#include<boost/iostreams/device/file.hpp>
#include<boost/algorithm/string.hpp>
-// local copy
-#include<boost/math/nonfinite_num_facets.hpp>
+
+#if BOOST_VERSION>=104700
+ #include<boost/math/special_functions/nonfinite_num_facets.hpp>
+#else
+ #include<boost/math/nonfinite_num_facets.hpp>
+#endif
+
+
+
namespace yade{
/* Utility template functions for (de)serializing objects using boost::serialization from/to streams or files.
=== modified file 'py/wrapper/yadeWrapper.cpp'
--- py/wrapper/yadeWrapper.cpp 2011-02-27 13:54:43 +0000
+++ py/wrapper/yadeWrapper.cpp 2011-12-19 17:02:15 +0000
@@ -47,8 +47,11 @@
// #include<yade/pkg/dem/Shop.hpp>
#include<yade/pkg/dem/Clump.hpp>
-// local copy
-#include<boost/math/nonfinite_num_facets.hpp>
+#if BOOST_VERSION>=104700
+ #include<boost/math/special_functions/nonfinite_num_facets.hpp>
+#else
+ #include<boost/math/nonfinite_num_facets.hpp>
+#endif
#include<locale>
#include<boost/archive/codecvt_null.hpp>
_______________________________________________
Mailing list: https://launchpad.net/~yade-dev
Post to : [email protected]
Unsubscribe : https://launchpad.net/~yade-dev
More help : https://help.launchpad.net/ListHelp
