VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-21 23:55:13 -05:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1092 from srcejon/fix_1087

Browse Source 
Fix for #1087. Support compilation with Boost >= 1.77
This commit is contained in:
Edouard Griffiths 2021-12-29 17:35:39 +01:00 committed by GitHub
commit 60c0e31173
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/channelrx/noisefigure/noisefigure.cpp
View File

@ -16,6 +16,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>. // // along with this program. If not, see <http://www.gnu.org/licenses/>. //
/////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////
#include <boost/version.hpp>
#include <boost/math/interpolators/barycentric_rational.hpp> #include <boost/math/interpolators/barycentric_rational.hpp>
#include "noisefigure.h" #include "noisefigure.h"
@ -41,6 +42,12 @@
#include "channel/channelwebapiutils.h" #include "channel/channelwebapiutils.h"
#include "maincore.h" #include "maincore.h"
#if BOOST_VERSION < 107700
using namespace boost::math;
#else
using namespace boost::math::interpolators;
#endif
MESSAGE_CLASS_DEFINITION(NoiseFigure::MsgConfigureNoiseFigure, Message) MESSAGE_CLASS_DEFINITION(NoiseFigure::MsgConfigureNoiseFigure, Message)
MESSAGE_CLASS_DEFINITION(NoiseFigure::MsgPowerMeasurement, Message) MESSAGE_CLASS_DEFINITION(NoiseFigure::MsgPowerMeasurement, Message)
MESSAGE_CLASS_DEFINITION(NoiseFigure::MsgNFMeasurement, Message) MESSAGE_CLASS_DEFINITION(NoiseFigure::MsgNFMeasurement, Message)
@ -180,7 +187,7 @@ double NoiseFigure::calcENR(double frequency)
else else
{ {
int order = size - 1; int order = size - 1;
boost::math::barycentric_rational<double> interpolant(std::move(x), std::move(y), order); barycentric_rational<double> interpolant(std::move(x), std::move(y), order);
enr = interpolant(frequency); enr = interpolant(frequency);
} }
} }

11
plugins/channelrx/noisefigure/noisefigureenrdialog.cpp
View File

@ -17,11 +17,20 @@
#include <QDebug> #include <QDebug>
#include <array>
#include <boost/version.hpp>
#include <boost/math/interpolators/barycentric_rational.hpp> #include <boost/math/interpolators/barycentric_rational.hpp>
#include "noisefigureenrdialog.h" #include "noisefigureenrdialog.h"
#include "util/interpolation.h" #include "util/interpolation.h"
#if BOOST_VERSION < 107700
using namespace boost::math;
#else
using namespace boost::math::interpolators;
#endif
NoiseFigureENRDialog::NoiseFigureENRDialog(NoiseFigureSettings *settings, QWidget* parent) : NoiseFigureENRDialog::NoiseFigureENRDialog(NoiseFigureSettings *settings, QWidget* parent) :
QDialog(parent), QDialog(parent),
m_settings(settings), m_settings(settings),
@ -153,7 +162,7 @@ void NoiseFigureENRDialog::plotChart()
y[i] = points[i][1]; y[i] = points[i][1];
} }
int order = size - 1; int order = size - 1;
boost::math::barycentric_rational<double> interpolant(std::move(x), std::move(y), order); barycentric_rational<double> interpolant(std::move(x), std::move(y), order);
x.resize(size); x.resize(size);
y.resize(size); y.resize(size);