• Koen Kooi's avatar
    fix qmin/qmax types · 0c66e26a
    Koen Kooi authored
    qreal is a double on some platforms (x86) and a float on others (e.g. ARM), cast it to fix build errors like these:
    
    src/ui/designer/QGCXYPlot.cc: In member function 'int
    XYPlotCurve::appendData(const QPointF&)':
    src/ui/designer/QGCXYPlot.cc:41:39: error: no matching function for call
    to 'qMin(double&, qreal)'
                 xmin = qMin(xmin, data.x());
                                           ^
    src/ui/designer/QGCXYPlot.cc:41:39: note: candidate is:
    In file included from
    /build/v2013.12/build/tmp-angstrom_v2013_12-eglibc/sysroots/sama5d3_xplained/usr/include/qt4/QtCore/qnamespace.h:45:0,
                     from
    /build/v2013.12/build/tmp-angstrom_v2013_12-eglibc/sysroots/sama5d3_xplained/usr/include/qt4/QtCore/qobjectdefs.h:45,
                     from
    /build/v2013.12/build/tmp-angstrom_v2013_12-eglibc/sysroots/sama5d3_xplained/usr/include/qt4/QtGui/qwindowdefs.h:45,
                     from
    /build/v2013.12/build/tmp-angstrom_v2013_12-eglibc/sysroots/sama5d3_xplained/usr/include/qt4/QtGui/qwidget.h:46,
                     from
    /build/v2013.12/build/tmp-angstrom_v2013_12-eglibc/sysroots/sama5d3_xplained/usr/include/qt4/QtGui/qdockwidget.h:45,
                     from
    /build/v2013.12/build/tmp-angstrom_v2013_12-eglibc/sysroots/sama5d3_xplained/usr/include/qt4/QtGui/QDockWidget:1,
                     from src/ui/designer/QGCXYPlot.cc:1:
    /build/v2013.12/build/tmp-angstrom_v2013_12-eglibc/sysroots/sama5d3_xplained/usr/include/qt4/QtCore/qglobal.h:1213:34:
    note: template<class T> const T& qMin(const T&, const T&)
     Q_DECL_CONSTEXPR inline const T &qMin(const T &a, const T &b) { return
    (a < b) ? a : b; }
                                      ^
    
    See http://www.qtcentre.org/archive/index.php/t-45475.html for some
    background.
    
    This fixes #625
    Signed-off-by: 's avatarKoen Kooi <koen@dominion.thruhere.net>
    0c66e26a
Name
Last commit
Last update
..
apps Loading commit data...
comm Loading commit data...
input Loading commit data...
plugins Loading commit data...
qgcunittest Loading commit data...
uas Loading commit data...
ui Loading commit data...
GAudioOutput.cc Loading commit data...
GAudioOutput.h Loading commit data...
LogCompressor.cc Loading commit data...
LogCompressor.h Loading commit data...
MG.h Loading commit data...
PX4FirmwareUpgradeWorker.cc Loading commit data...
PX4FirmwareUpgradeWorker.h Loading commit data...
QGC.cc Loading commit data...
QGC.h Loading commit data...
QGCCore.cc Loading commit data...
QGCCore.h Loading commit data...
QGCGeo.h Loading commit data...
Waypoint.cc Loading commit data...
Waypoint.h Loading commit data...
configuration.h Loading commit data...
documentation.dox Loading commit data...
main.cc Loading commit data...