Mercurial Mercurial > Dionysus / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use boost/next_prior.hpp with Boost >= 1.67
authorDmitriy Morozov <dmitriy@mrzv.org>
Sat, 23 Nov 2019 21:40:40 -0800
changeset 295 0beafc10719a
parent 294 5810d70ec967
child 296 c328d7ecf6b8
Use boost/next_prior.hpp with Boost >= 1.67
bindings/python/optional.h file | annotate | diff | comparison | revisions
include/geometry/kinetic-sort.h file | annotate | diff | comparison | revisions
include/topology/chain.hpp file | annotate | diff | comparison | revisions
include/topology/cohomology-persistence.hpp file | annotate | diff | comparison | revisions
include/topology/rips.hpp file | annotate | diff | comparison | revisions
include/topology/static-persistence.hpp file | annotate | diff | comparison | revisions
include/topology/zigzag-persistence.hpp file | annotate | diff | comparison | revisions
include/utilities/boost.h file | annotate | diff | comparison | revisions
include/utilities/consistencylist.h file | annotate | diff | comparison | revisions
include/utilities/eventqueue.h file | annotate | diff | comparison | revisions
include/utilities/orderlist.h file | annotate | diff | comparison | revisions
tests/geometry/test-kinetic-sort.cpp file | annotate | diff | comparison | revisions
tests/geometry/test-ksort-linear.cpp file | annotate | diff | comparison | revisions 
--- a/bindings/python/optional.h	Sat Nov 23 21:29:50 2019 -0800
+++ b/bindings/python/optional.h	Sat Nov 23 21:40:40 2019 -0800
@@ -3,7 +3,7 @@
 
 #include <boost/python.hpp>
 #include <boost/optional.hpp>
-#include <boost/utility.hpp>
+#include <utilities/boost.h>
 
 // Taken from an email by John Wiegley; 
 // http://mail.python.org/pipermail/cplusplus-sig/2007-May/012003.html
--- a/include/geometry/kinetic-sort.h	Sat Nov 23 21:29:50 2019 -0800
+++ b/include/geometry/kinetic-sort.h	Sat Nov 23 21:40:40 2019 -0800
@@ -3,7 +3,7 @@
 
 #include <list>
 #include <boost/function.hpp>
-#include <boost/utility.hpp>
+#include <utilities/boost.h>
 #include <iostream>
 
 /**
--- a/include/topology/chain.hpp	Sat Nov 23 21:29:50 2019 -0800
+++ b/include/topology/chain.hpp	Sat Nov 23 21:40:40 2019 -0800
@@ -5,7 +5,7 @@
 #include <boost/serialization/split_member.hpp>
 #include <boost/serialization/nvp.hpp>
 #include <boost/serialization/binary_object.hpp>
-#include <boost/utility.hpp>
+#include <utilities/boost.h>
 
 #include "utilities/log.h"
 #include "utilities/counter.h"
--- a/include/topology/cohomology-persistence.hpp	Sat Nov 23 21:29:50 2019 -0800
+++ b/include/topology/cohomology-persistence.hpp	Sat Nov 23 21:40:40 2019 -0800
@@ -1,4 +1,4 @@
-#include <boost/utility.hpp>
+#include <utilities/boost.h>
 #include <queue>
 #include <vector>
 #include <limits>
--- a/include/topology/rips.hpp	Sat Nov 23 21:29:50 2019 -0800
+++ b/include/topology/rips.hpp	Sat Nov 23 21:40:40 2019 -0800
@@ -1,10 +1,10 @@
 #include <algorithm>
 #include <utility>
-#include <boost/utility.hpp>
 #include <iostream>
 #include <utilities/log.h>
 #include <utilities/counter.h>
 #include <utilities/indirect.h>
+#include <utilities/boost.h>
 #include <boost/iterator/counting_iterator.hpp>
 #include <functional>
 
--- a/include/topology/static-persistence.hpp	Sat Nov 23 21:29:50 2019 -0800
+++ b/include/topology/static-persistence.hpp	Sat Nov 23 21:40:40 2019 -0800
@@ -3,7 +3,7 @@
 #include <utilities/property-maps.h>
 
 #include <boost/utility/enable_if.hpp>
-#include <boost/utility.hpp>
+#include <utilities/boost.h>
 #include <boost/foreach.hpp>
 
 #include <boost/foreach.hpp>
--- a/include/topology/zigzag-persistence.hpp	Sat Nov 23 21:29:50 2019 -0800
+++ b/include/topology/zigzag-persistence.hpp	Sat Nov 23 21:40:40 2019 -0800
@@ -1,5 +1,5 @@
 #include <utilities/log.h>
-#include <boost/utility.hpp>
+#include <utilities/boost.h>
 #include <boost/iterator/filter_iterator.hpp>
 #include <algorithm>
 #include <utilities/indirect.h>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/include/utilities/boost.h	Sat Nov 23 21:40:40 2019 -0800
@@ -0,0 +1,6 @@
+#include <boost/version.hpp>
+#if BOOST_VERSION >= 106700
+#include <boost/next_prior.hpp>
+#else
+#include <boost/utility.hpp>
+#endif
--- a/include/utilities/consistencylist.h	Sat Nov 23 21:29:50 2019 -0800
+++ b/include/utilities/consistencylist.h	Sat Nov 23 21:40:40 2019 -0800
@@ -13,7 +13,7 @@
 #include <list>
 #include "types.h"
 
-#include <boost/utility.hpp>
+#include <utilities/boost.h>
 #include <boost/iterator/iterator_adaptor.hpp>
 //#include <boost/type_traits/is_convertible.hpp>
 //#include <boost/utility/enable_if.hpp>
--- a/include/utilities/eventqueue.h	Sat Nov 23 21:29:50 2019 -0800
+++ b/include/utilities/eventqueue.h	Sat Nov 23 21:40:40 2019 -0800
@@ -5,7 +5,7 @@
 #include <vector>
 #include <functional>
 
-#include <boost/utility.hpp>
+#include <utilities/boost.h>
 #include <boost/iterator/iterator_adaptor.hpp>
 namespace b = boost;
 
--- a/include/utilities/orderlist.h	Sat Nov 23 21:29:50 2019 -0800
+++ b/include/utilities/orderlist.h	Sat Nov 23 21:40:40 2019 -0800
@@ -20,7 +20,7 @@
 
 #include "types.h"
 
-#include <boost/utility.hpp>
+#include <utilities/boost.h>
 #include <boost/iterator/iterator_adaptor.hpp>
 //#include <boost/type_traits/is_convertible.hpp>
 //#include <boost/utility/enable_if.hpp>
--- a/tests/geometry/test-kinetic-sort.cpp	Sat Nov 23 21:29:50 2019 -0800
+++ b/tests/geometry/test-kinetic-sort.cpp	Sat Nov 23 21:40:40 2019 -0800
@@ -3,7 +3,7 @@
 #include <geometry/kinetic-sort.h>
 #include <iostream>
 
-#include <boost/utility.hpp>
+#include <utilities/boost.h>
 #include <boost/bind.hpp>
 
 #include <utilities/log.h>
--- a/tests/geometry/test-ksort-linear.cpp	Sat Nov 23 21:29:50 2019 -0800
+++ b/tests/geometry/test-ksort-linear.cpp	Sat Nov 23 21:40:40 2019 -0800
@@ -3,7 +3,7 @@
 #include <geometry/linear-kernel.h>
 #include <iostream>
 
-#include <boost/utility.hpp>
+#include <utilities/boost.h>
 #include <boost/bind.hpp>
 
 #include <utilities/log.h>
Dionysus