# HG changeset patch
# User Chris Cannam
# Date 1426080637 0
# Node ID 0559f25b99f2208ffb9ebb74ed173d3ec66f0e41
# Parent  98d4dabbf740a4224edeccea6c226e68d6d3ea40
Build fixes for OS/X

diff -r 98d4dabbf740 -r 0559f25b99f2 base/test/test.pro
--- 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
 
diff -r 98d4dabbf740 -r 0559f25b99f2 data/fileio/WavFileWriter.cpp
--- 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,
diff -r 98d4dabbf740 -r 0559f25b99f2 data/fileio/test/test.pro
--- 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
 
diff -r 98d4dabbf740 -r 0559f25b99f2 data/model/IntervalModel.h
--- 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
diff -r 98d4dabbf740 -r 0559f25b99f2 data/model/TabularModel.h
--- 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; }