Mercurial > hg > svcore

diff data/fileio/CSVFileReader.h @ 1038:cc27f35aa75c cxx11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Introducing the signed 64-bit frame index type, and fixing build failures from inclusion of -Wconversion with -Werror. Not finished yet.
author Chris Cannam
date Tue, 03 Mar 2015 15:18:24 +0000
parents 920699b6989d
children 26cf6d5251ec
line wrap: on
line diff
--- a/data/fileio/CSVFileReader.h	Tue Mar 03 09:33:59 2015 +0000
+++ b/data/fileio/CSVFileReader.h	Tue Mar 03 15:18:24 2015 +0000
@@ -20,6 +20,8 @@
 
 #include "CSVFormat.h"
 
+#include "base/BaseTypes.h"
+
 #include <QList>
 #include <QStringList>
 
@@ -58,8 +60,8 @@
     mutable int m_warnings;
     int m_mainModelSampleRate;
 
-    int convertTimeValue(QString, int lineno, int sampleRate,
-                            int windowSize) const;
+    sv_frame_t convertTimeValue(QString, int lineno, int sampleRate,
+                                int windowSize) const;
 };