diff options
author | Julien de Kozak <jdekozak@hotmail.com> | 2014-11-01 18:35:44 +0100 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2014-12-01 23:18:11 +0100 |
commit | cb8abbe8d2f0e4dfe52bd35613ebba7689628eca (patch) | |
tree | cd6ef56b6c2af7c1aeda26d3d2afd200c4dabf89 /libs/vamp-plugins | |
parent | 036b6234acdbf892171c1cbfa99efb823d6ebc58 (diff) |
Make it compile with C++11 support.
Reference : https://bugs.webkit.org/show_bug.cgi?id=59249
Diffstat (limited to 'libs/vamp-plugins')
-rw-r--r-- | libs/vamp-plugins/SpectralCentroid.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libs/vamp-plugins/SpectralCentroid.cpp b/libs/vamp-plugins/SpectralCentroid.cpp index f93fdcaa32..762af53989 100644 --- a/libs/vamp-plugins/SpectralCentroid.cpp +++ b/libs/vamp-plugins/SpectralCentroid.cpp @@ -40,11 +40,11 @@ #include <float.h> // 'std::isinf()' and 'std::isnan()' are not available in MSVC. -#define isinf(val) !((bool)_finite((double)val)) -#define isnan(val) (bool)_isnan((double)val) +#define isinf_local(val) !((bool)_finite((double)val)) +#define isnan_local(val) (bool)_isnan((double)val) #else -using std::isnan; -using std::isinf; +#define isinf_local std::isinf +#define isnan_local std::isnan #endif #include "SpectralCentroid.h" @@ -176,13 +176,13 @@ SpectralCentroid::process(const float *const *inputBuffers, Vamp::RealTime) Feature feature; feature.hasTimestamp = false; - if (!isnan(centroidLog) && !isinf(centroidLog)) { + if (!isnan_local(centroidLog) && !isinf_local(centroidLog)) { feature.values.push_back(centroidLog); } returnFeatures[0].push_back(feature); feature.values.clear(); - if (!isnan(centroidLin) && !isinf(centroidLin)) { + if (!isnan_local(centroidLin) && !isinf_local(centroidLin)) { feature.values.push_back(centroidLin); } returnFeatures[1].push_back(feature); |