Skip to content

Fixed C++17 compatibility issues #1370

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

Open
Andrew1040 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed C++17 compatibility issues #1370

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
14 changes: 14 additions & 0 deletions src/algorithms/highlevel/chromaprinter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@

using namespace std;

#if __cplusplus >= 201103L
using namespace std::placeholders;
#endif

namespace essentia {
namespace standard {

Expand Down Expand Up @@ -53,8 +57,13 @@ void Chromaprinter::compute() {

// Copy the signal to new vector to expand it to the int16_t dynamic range before the cast.
std::vector<Real> signalScaled = signal;
#if __cplusplus >= 201103L
std::transform(signalScaled.begin(), signalScaled.end(), signalScaled.begin(),
std::bind(std::multiplies<Real>(), pow(2,15), _1));
#else
std::transform(signalScaled.begin(), signalScaled.end(), signalScaled.begin(),
std::bind1st(std::multiplies<Real>(), pow(2,15)));
#endif

std::vector<int16_t> signalCast(signalScaled.begin(), signalScaled.end());

Expand Down Expand Up @@ -159,8 +168,13 @@ AlgorithmStatus Chromaprinter::process() {

// Copy the signal to new vector to expand it to the int16_t dynamic range before the cast.
std::vector<Real> signalScaled = signal;
#if __cplusplus >= 201103L
std::transform(signalScaled.begin(), signalScaled.end(), signalScaled.begin(),
std::bind(std::multiplies<Real>(), pow(2,15), _1));
#else
std::transform(signalScaled.begin(), signalScaled.end(), signalScaled.begin(),
std::bind1st(std::multiplies<Real>(), pow(2,15)));
#endif

std::vector<int16_t> signalCast(signalScaled.begin(), signalScaled.end());

Expand Down