Mercurial > hg > svcore
changeset 1608:0e0947896fd3
Fix compiler warnings
| author | Chris Cannam |
|---|---|
| date | Wed, 27 Feb 2019 12:31:12 +0000 |
| parents | a77fc6da288b |
| children | 560453546749 901f37d32060 |
| files | base/Thread.cpp data/model/IntervalModel.h data/model/Model.h data/model/SparseModel.h data/model/SparseValueModel.h |
| diffstat | 5 files changed, 13 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/base/Thread.cpp Mon Feb 18 11:37:41 2019 +0000 +++ b/base/Thread.cpp Wed Feb 27 12:31:12 2019 +0000 @@ -78,6 +78,8 @@ #ifdef DEBUG_MUTEX_LOCKER cerr << "MutexLocker: Locking \"" << m_name << "\" in " << (void *)QThread::currentThreadId() << endl; +#else + (void)m_name; #endif }
--- a/data/model/IntervalModel.h Mon Feb 18 11:37:41 2019 +0000 +++ b/data/model/IntervalModel.h Wed Feb 27 12:31:12 2019 +0000 @@ -48,14 +48,14 @@ * and after). Consequently this can be very slow (optimised data * structures still to be done!). */ - virtual typename SparseValueModel<PointType>::PointList getPoints(sv_frame_t start, sv_frame_t end) const; + typename SparseValueModel<PointType>::PointList getPoints(sv_frame_t start, sv_frame_t end) const override; /** * PointTypes have a duration, so this returns all points that span the * given frame. Consequently this can be very slow (optimised * data structures still to be done!). */ - virtual typename SparseValueModel<PointType>::PointList getPoints(sv_frame_t frame) const; + typename SparseValueModel<PointType>::PointList getPoints(sv_frame_t frame) const override; const typename SparseModel<PointType>::PointList &getPoints() const override { return SparseModel<PointType>::getPoints();
--- a/data/model/Model.h Mon Feb 18 11:37:41 2019 +0000 +++ b/data/model/Model.h Wed Feb 27 12:31:12 2019 +0000 @@ -233,8 +233,8 @@ QString getRDFTypeURI() const { return m_typeUri; } void toXml(QTextStream &stream, - QString indent = "", - QString extraAttributes = "") const override; + QString indent = "", + QString extraAttributes = "") const override; virtual QString toDelimitedDataString(QString delimiter) const { return toDelimitedDataStringSubset
--- a/data/model/SparseModel.h Mon Feb 18 11:37:41 2019 +0000 +++ b/data/model/SparseModel.h Wed Feb 27 12:31:12 2019 +0000 @@ -56,8 +56,8 @@ virtual ~SparseModel() { } bool isOK() const override { return true; } - virtual sv_frame_t getStartFrame() const; - virtual sv_frame_t getEndFrame() const; + sv_frame_t getStartFrame() const override; + sv_frame_t getEndFrame() const override; sv_samplerate_t getSampleRate() const override { return m_sampleRate; } // Number of frames of the underlying sample rate that this model @@ -164,9 +164,9 @@ virtual QString getXmlOutputType() const { return "sparse"; } - virtual void toXml(QTextStream &out, - QString indent = "", - QString extraAttributes = "") const; + void toXml(QTextStream &out, + QString indent = "", + QString extraAttributes = "") const override; QString toDelimitedDataString(QString delimiter) const override { return toDelimitedDataStringWithOptions
--- a/data/model/SparseValueModel.h Mon Feb 18 11:37:41 2019 +0000 +++ b/data/model/SparseValueModel.h Wed Feb 27 12:31:12 2019 +0000 @@ -114,8 +114,8 @@ } void toXml(QTextStream &stream, - QString indent = "", - QString extraAttributes = "") const override + QString indent = "", + QString extraAttributes = "") const override { std::cerr << "SparseValueModel::toXml: extraAttributes = \"" << extraAttributes.toStdString() << std::endl;