import new upstream nautilus stable release 14.2.8

[ceph.git] / ceph / src / boost / boost / graph / adjacency_matrix.hpp

diff --git a/ceph/src/boost/boost/graph/adjacency_matrix.hpp b/ceph/src/boost/boost/graph/adjacency_matrix.hpp
index ade7351fb8d7b52f9bde73a608bdafdf777046df..571bc3d3d110c946d33c7b976d02605dfd09a58d 100644 (file)
--- a/ceph/src/boost/boost/graph/adjacency_matrix.hpp
+++ b/ceph/src/boost/boost/graph/adjacency_matrix.hpp
@@ -14,9 +14,9 @@
 #include <boost/config.hpp>
 #include <vector>
 #include <memory>
+#include <iterator>
 #include <boost/assert.hpp>
 #include <boost/limits.hpp>
-#include <boost/iterator.hpp>
 #include <boost/graph/graph_traits.hpp>
 #include <boost/graph/graph_mutability_traits.hpp>
 #include <boost/graph/graph_selectors.hpp>
@@ -499,7 +499,11 @@ namespace boost {
 #if defined(BOOST_NO_STD_ALLOCATOR)
     typedef std::vector<StoredEdge> Matrix;
 #else
+#if defined(BOOST_NO_CXX11_ALLOCATOR)
     typedef typename Allocator::template rebind<StoredEdge>::other Alloc;
+#else
+    typedef typename std::allocator_traits<Allocator>::template rebind_alloc<StoredEdge> Alloc;
+#endif
     typedef std::vector<StoredEdge, Alloc> Matrix;
 #endif
     typedef typename Matrix::iterator MatrixIter;