From eebe1833754369dc8dfc78e9de422f4ef33b701f Mon Sep 17 00:00:00 2001 From: Mikhail Gorbushin Date: Fri, 17 Aug 2018 14:21:05 +0300 Subject: [PATCH] remove std::bind2nd --- .../extension/numeric/pixel_numeric_operations.hpp | 14 ++++++++------ include/boost/gil/planar_pixel_iterator.hpp | 4 ---- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/include/boost/gil/extension/numeric/pixel_numeric_operations.hpp b/include/boost/gil/extension/numeric/pixel_numeric_operations.hpp index f5fc7c3e5..45d4c8f82 100644 --- a/include/boost/gil/extension/numeric/pixel_numeric_operations.hpp +++ b/include/boost/gil/extension/numeric/pixel_numeric_operations.hpp @@ -78,9 +78,10 @@ struct pixel_multiplies_scalar_t { const Scalar& s) const { PixelR result; static_transform(p,result, - std::bind2nd(channel_multiplies_scalar_t::type, - Scalar, - typename channel_type::type>(),s)); + std::bind(channel_multiplies_scalar_t::type, + Scalar, + typename channel_type::type>(), + std::placeholders::_1, s)); return result; } }; @@ -112,9 +113,10 @@ struct pixel_divides_scalar_t { const Scalar& s) const { PixelR result; static_transform(p,result, - std::bind2nd(channel_divides_scalar_t::type, - Scalar, - typename channel_type::type>(),s)); + std::bind(channel_divides_scalar_t::type, + Scalar, + typename channel_type::type>(), + std::placeholders::_1, s)); return result; } }; diff --git a/include/boost/gil/planar_pixel_iterator.hpp b/include/boost/gil/planar_pixel_iterator.hpp index 9585e8457..bcbf06de2 100644 --- a/include/boost/gil/planar_pixel_iterator.hpp +++ b/include/boost/gil/planar_pixel_iterator.hpp @@ -114,11 +114,7 @@ private: void increment() { static_transform(*this,*this,detail::inc()); } void decrement() { static_transform(*this,*this,detail::dec()); } -#ifdef BOOST_NO_CXX98_BINDERS void advance(std::ptrdiff_t d){ static_transform(*this,*this,std::bind(detail::plus_asymmetric(),std::placeholders::_1,d)); } -#else - void advance(std::ptrdiff_t d){ static_transform(*this,*this,std::bind2nd(detail::plus_asymmetric(),d)); } -#endif reference dereference() const { return this->template deref(); } std::ptrdiff_t distance_to(const planar_pixel_iterator& it) const { return gil::at_c<0>(it)-gil::at_c<0>(*this); }