Mercurial > hg > svcore
changeset 1055:0559f25b99f2 cxx11
Build fixes for OS/X
| author | Chris Cannam |
|---|---|
| date | Wed, 11 Mar 2015 13:30:37 +0000 |
| parents | 98d4dabbf740 |
| children | 5c5d4863b428 |
| files | base/test/test.pro data/fileio/WavFileWriter.cpp data/fileio/test/test.pro data/model/IntervalModel.h data/model/TabularModel.h |
| diffstat | 5 files changed, 6 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/base/test/test.pro Wed Mar 11 12:20:06 2015 +0000 +++ b/base/test/test.pro Wed Mar 11 13:30:37 2015 +0000 @@ -38,7 +38,7 @@ } } -CONFIG += qt thread warn_on stl rtti exceptions console +CONFIG += qt thread warn_on stl rtti exceptions console c++11 QT += network xml testlib QT -= gui
--- a/data/fileio/WavFileWriter.cpp Wed Mar 11 12:20:06 2015 +0000 +++ b/data/fileio/WavFileWriter.cpp Wed Mar 11 13:30:37 2015 +0000 @@ -23,6 +23,7 @@ #include <QFileInfo> #include <iostream> +#include <cmath> WavFileWriter::WavFileWriter(QString path, sv_samplerate_t sampleRate,
--- a/data/fileio/test/test.pro Wed Mar 11 12:20:06 2015 +0000 +++ b/data/fileio/test/test.pro Wed Mar 11 13:30:37 2015 +0000 @@ -38,7 +38,7 @@ } } -CONFIG += qt thread warn_on stl rtti exceptions console +CONFIG += qt thread warn_on stl rtti exceptions console c++11 QT += network xml testlib QT -= gui
--- a/data/model/IntervalModel.h Wed Mar 11 12:20:06 2015 +0000 +++ b/data/model/IntervalModel.h Wed Mar 11 13:30:37 2015 +0000 @@ -48,7 +48,7 @@ * and after). Consequently this can be very slow (optimised data * structures still to be done!). */ - virtual typename SparseValueModel<PointType>::PointList getPoints(long start, long end) const; + virtual typename SparseValueModel<PointType>::PointList getPoints(sv_frame_t start, sv_frame_t end) const; /** * PointTypes have a duration, so this returns all points that span the
--- a/data/model/TabularModel.h Wed Mar 11 12:20:06 2015 +0000 +++ b/data/model/TabularModel.h Wed Mar 11 13:30:37 2015 +0000 @@ -48,8 +48,8 @@ virtual bool isColumnTimeValue(int col) const = 0; virtual SortType getSortType(int col) const = 0; - virtual long getFrameForRow(int row) const = 0; - virtual int getRowForFrame(long frame) const = 0; + virtual sv_frame_t getFrameForRow(int row) const = 0; + virtual int getRowForFrame(sv_frame_t frame) const = 0; virtual bool isEditable() const { return false; } virtual Command *getSetDataCommand(int /* row */, int /* column */, const QVariant &, int /* role */) { return 0; }