Skip to content

Remove deprecated std::binary_function #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jzmaddock merged 1 commit into from
Jun 1, 2021
Merged

Remove deprecated std::binary_function #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions include/boost/graph/distributed/crauser_et_al_shortest_paths.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,10 @@ namespace detail {
template<typename Vertex, typename DistanceMap, typename MinInWeightMap,
typename Combine, typename Compare>
struct min_in_distance_compare
: std::binary_function<Vertex, Vertex, bool>
{
typedef Vertex first_argument_type;
typedef Vertex second_argument_type;
typedef bool result_type;
min_in_distance_compare(DistanceMap d, MinInWeightMap m,
Combine combine, Compare compare)
: distance_map(d), min_in_weight(m), combine(combine),
Expand All @@ -120,8 +122,10 @@ namespace detail {
template<typename Vertex, typename DistanceMap, typename MinOutWeightMap,
typename Combine, typename Compare>
struct min_out_distance_compare
: std::binary_function<Vertex, Vertex, bool>
{
typedef Vertex first_argument_type;
typedef Vertex second_argument_type;
typedef bool result_type;
min_out_distance_compare(DistanceMap d, MinOutWeightMap m,
Combine combine, Compare compare)
: distance_map(d), min_out_weight(m), combine(combine),
Expand Down
16 changes: 12 additions & 4 deletions include/boost/graph/parallel/algorithm.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
#include <boost/optional.hpp>
#include <boost/config.hpp> // for BOOST_STATIC_CONSTANT
#include <vector>
#include <functional>

namespace boost { namespace parallel {
template<typename BinaryOp>
Expand All @@ -26,20 +25,29 @@ namespace boost { namespace parallel {
};

template<typename T>
struct minimum : std::binary_function<T, T, T>
struct minimum
{
typedef T first_argument_type;
typedef T second_argument_type;
typedef T result_type;
const T& operator()(const T& x, const T& y) const { return x < y? x : y; }
};

template<typename T>
struct maximum : std::binary_function<T, T, T>
struct maximum
{
typedef T first_argument_type;
typedef T second_argument_type;
typedef T result_type;
const T& operator()(const T& x, const T& y) const { return x < y? y : x; }
};

template<typename T>
struct sum : std::binary_function<T, T, T>
struct sum
{
typedef T first_argument_type;
typedef T second_argument_type;
typedef T result_type;
const T operator()(const T& x, const T& y) const { return x + y; }
};

Expand Down