diff --git a/src/algorithms/highlevel/chromaprinter.cpp b/src/algorithms/highlevel/chromaprinter.cpp index e9435c04d..1713d1b9e 100644 --- a/src/algorithms/highlevel/chromaprinter.cpp +++ b/src/algorithms/highlevel/chromaprinter.cpp @@ -54,7 +54,7 @@ void Chromaprinter::compute() { // Copy the signal to new vector to expand it to the int16_t dynamic range before the cast. std::vector signalScaled = signal; std::transform(signalScaled.begin(), signalScaled.end(), signalScaled.begin(), - std::bind1st(std::multiplies(), pow(2,15))); + std::bind(std::multiplies(), pow(2,15), std::placeholders::_1)); std::vector signalCast(signalScaled.begin(), signalScaled.end()); @@ -160,7 +160,7 @@ AlgorithmStatus Chromaprinter::process() { // Copy the signal to new vector to expand it to the int16_t dynamic range before the cast. std::vector signalScaled = signal; std::transform(signalScaled.begin(), signalScaled.end(), signalScaled.begin(), - std::bind1st(std::multiplies(), pow(2,15))); + std::bind(std::multiplies(), pow(2,15), std::placeholders::_1)); std::vector signalCast(signalScaled.begin(), signalScaled.end()); diff --git a/src/essentia/essentiamath.h b/src/essentia/essentiamath.h index 9e3606859..12f00c9e4 100644 --- a/src/essentia/essentiamath.h +++ b/src/essentia/essentiamath.h @@ -914,7 +914,7 @@ std::vector derivative(const std::vector& array) { } template > -class PairCompare : public std::binary_function { +class PairCompare { Comparator _cmp; public: bool operator () (const std::pair& p1, const std::pair& p2) const { diff --git a/src/essentia/types.h b/src/essentia/types.h index 8114556ce..cfc5b6d6d 100644 --- a/src/essentia/types.h +++ b/src/essentia/types.h @@ -115,8 +115,7 @@ inline bool case_insensitive_char_cmp(char a, char b) { /** * Function object for comparing two strings in a case-insensitive manner. */ -struct case_insensitive_str_cmp - : public std::binary_function { +struct case_insensitive_str_cmp { bool operator()(const std::string& str1, const std::string& str2) const { return std::lexicographical_compare(str1.begin(), str1.end(), str2.begin(), str2.end(), diff --git a/src/essentia/utils/peak.h b/src/essentia/utils/peak.h index 12175fc54..83c095092 100644 --- a/src/essentia/utils/peak.h +++ b/src/essentia/utils/peak.h @@ -71,7 +71,7 @@ class Peak { // the positions are equal it sorts by descending magnitude template, typename Comp2=std::greater_equal > -class ComparePeakPosition : public std::binary_function { +class ComparePeakPosition { Comp1 _cmp1; Comp2 _cmp2; public: @@ -86,7 +86,7 @@ class ComparePeakPosition : public std::binary_function { // the magnitudes are equal it sorts by ascending position template, typename Comp2=std::less_equal > -class ComparePeakMagnitude : public std::binary_function { +class ComparePeakMagnitude { Comp1 _cmp1; Comp2 _cmp2; public: