Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2026-01-13 08:05:52 +01:00
Code Issues Releases Wiki Activity

Use portable wxIsNaN() instead of isnan()

Browse Source 
isnan() is not defined when compiling with g++ 5.3.1 on Ubuntu 16.04. It
is called std::isnan() in C++11 instead. Therefore use wxIsNaN() instead
which already defines the correct name.
This commit is contained in:
Benjamin Drung
2016-05-14 00:05:22 +02:00
parent 8d4ef6054a
commit 13630dc91d
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/effects/lv2/LV2Effect.cpp
View File

@@ -13,17 +13,12 @@
#if defined(USE_LV2) #if defined(USE_LV2)
#if defined(__WXMSW__)
#include <float.h>
#define isfinite _finite
#define isnan _isnan
#endif
#include <wx/button.h> #include <wx/button.h>
#include <wx/choice.h> #include <wx/choice.h>
#include <wx/dcbuffer.h> #include <wx/dcbuffer.h>
#include <wx/dialog.h> #include <wx/dialog.h>
#include <wx/dynarray.h> #include <wx/dynarray.h>
#include <wx/math.h>
#include <wx/msgdlg.h> #include <wx/msgdlg.h>
#include <wx/sizer.h> #include <wx/sizer.h>
#include <wx/statbox.h> #include <wx/statbox.h>
@@ -562,13 +557,13 @@ bool LV2Effect::SetHost(EffectHostInterface *host)
lilv_scale_points_free(points); lilv_scale_points_free(points);
// Collect the value and range info // Collect the value and range info
ctrl.mHasLo = !isnan(minimumVals[i]); ctrl.mHasLo = !wxIsNaN(minimumVals[i]);
ctrl.mHasHi = !isnan(maximumVals[i]); ctrl.mHasHi = !wxIsNaN(maximumVals[i]);
ctrl.mMin = ctrl.mHasLo ? minimumVals[i] : 0.0; ctrl.mMin = ctrl.mHasLo ? minimumVals[i] : 0.0;
ctrl.mMax = ctrl.mHasHi ? maximumVals[i] : 1.0; ctrl.mMax = ctrl.mHasHi ? maximumVals[i] : 1.0;
ctrl.mLo = ctrl.mMin; ctrl.mLo = ctrl.mMin;
ctrl.mHi = ctrl.mMax; ctrl.mHi = ctrl.mMax;
ctrl.mDef = !isnan(defaultValues[i]) ? ctrl.mDef = !wxIsNaN(defaultValues[i]) ?
defaultValues[i] : defaultValues[i] :
ctrl.mHasLo ? ctrl.mHasLo ?
ctrl.mLo : ctrl.mLo :