From: Enblend <enb...@li...> - 2013-11-30 15:12:52
|
branch: details: http://enblend.hg.sourceforge.net/hgweb/enblend/enblend/hg/p/enblend/code/rev/2ed323bf558d changeset: 984:2ed323bf558d user: Chris <cs...@us...> date: Sat Nov 30 16:03:51 2013 +0100 description: Replace calls to the deprecated std::binder2nd() with call to std::bind(). Thanks to the Intel C++ Compiler v14.0.1 for pointing this out. diffstat: VERSION | 2 +- src/mask.h | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diffs (26 lines): diff -r 1929e26dc2d6 -r 2ed323bf558d VERSION --- a/VERSION Sat Nov 30 16:03:07 2013 +0100 +++ b/VERSION Sat Nov 30 16:03:51 2013 +0100 @@ -1,1 +1,1 @@ -4.2-15a9af77a5cf +4.2-1929e26dc2d6 diff -r 1929e26dc2d6 -r 2ed323bf558d src/mask.h --- a/src/mask.h Sat Nov 30 16:03:07 2013 +0100 +++ b/src/mask.h Sat Nov 30 16:03:51 2013 +0100 @@ -1212,11 +1212,11 @@ } if (Verbose >= VERBOSE_DIFFERENCE_STATISTICS) { - typedef std::binder2nd<std::not_equal_to<MismatchImagePixelType> > predicate; - - predicate non_maximum(std::bind2nd(std::not_equal_to<MismatchImagePixelType>(), - vigra::NumericTraits<MismatchImagePixelType>::max())); - enblend::FindAverageAndVarianceIf<MismatchImagePixelType, predicate> statistics(non_maximum); + auto non_maximum(std::bind(std::not_equal_to<MismatchImagePixelType>(), + std::placeholders::_1, + vigra::NumericTraits<MismatchImagePixelType>::max())); + enblend::FindAverageAndVarianceIf<MismatchImagePixelType, decltype(non_maximum)> + statistics(non_maximum); const double range = static_cast<double>(vigra::NumericTraits<MismatchImagePixelType>::max() - vigra::NumericTraits<MismatchImagePixelType>::min()); |