update boost on linux
This commit is contained in:
@@ -289,7 +289,11 @@ namespace boost {
|
||||
// invalidation for add_edge() with EdgeList=vecS. Instead we
|
||||
// hold a pointer to the property. std::auto_ptr is not
|
||||
// a perfect fit for the job, but it is darn close.
|
||||
#ifdef BOOST_NO_AUTO_PTR
|
||||
std::unique_ptr<Property> m_property;
|
||||
#else
|
||||
std::auto_ptr<Property> m_property;
|
||||
#endif
|
||||
};
|
||||
#else
|
||||
template <class Vertex, class Property>
|
||||
|
||||
@@ -14,6 +14,7 @@
|
||||
#include <iterator>
|
||||
#include <functional>
|
||||
#include <boost/config.hpp>
|
||||
#include <boost/iterator.hpp>
|
||||
|
||||
namespace boost {
|
||||
|
||||
|
||||
@@ -459,7 +459,7 @@ namespace detail {
|
||||
|
||||
edge_descriptor m_edge;
|
||||
|
||||
friend class iterator_core_access;
|
||||
friend class boost::iterator_core_access;
|
||||
};
|
||||
|
||||
template<typename CSRGraph>
|
||||
@@ -547,7 +547,7 @@ namespace detail {
|
||||
EdgeIndex m_index_in_backward_graph;
|
||||
const CSRGraph* m_graph;
|
||||
|
||||
friend class iterator_core_access;
|
||||
friend class boost::iterator_core_access;
|
||||
};
|
||||
|
||||
template <typename A, typename B>
|
||||
|
||||
@@ -82,8 +82,11 @@ namespace detail {
|
||||
// Similar to std::plus<T>, but maximizes parameters
|
||||
// rather than adding them.
|
||||
template <typename T>
|
||||
struct maximize : public std::binary_function<T, T, T>
|
||||
struct maximize
|
||||
{
|
||||
typedef T result_type;
|
||||
typedef T first_argument_type;
|
||||
typedef T second_argument_type;
|
||||
T operator ()(T x, T y) const
|
||||
{ BOOST_USING_STD_MAX(); return max BOOST_PREVENT_MACRO_SUBSTITUTION (x, y); }
|
||||
};
|
||||
@@ -93,11 +96,10 @@ namespace detail {
|
||||
// types, but should be specialized for those types that have
|
||||
// discrete notions of reciprocals.
|
||||
template <typename T>
|
||||
struct reciprocal : public std::unary_function<T, T>
|
||||
struct reciprocal
|
||||
{
|
||||
typedef std::unary_function<T, T> function_type;
|
||||
typedef typename function_type::result_type result_type;
|
||||
typedef typename function_type::argument_type argument_type;
|
||||
typedef T result_type;
|
||||
typedef T argument_type;
|
||||
T operator ()(T t)
|
||||
{ return T(1) / t; }
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user