# HG changeset patch
# User lbajardsilogic
# Date 1196169104 0
# Node ID 6a31322cd9ed42e90e87123a6880b1587cf98bc4
# Parent  56c167f3648a3bba77b514ced1db433b322c6bef
compilation under linux: resolve bug with std::min

diff -r 56c167f3648a -r 6a31322cd9ed data/fileio/CSVFileReader.cpp
--- a/data/fileio/CSVFileReader.cpp	Tue Nov 27 13:11:19 2007 +0000
+++ b/data/fileio/CSVFileReader.cpp	Tue Nov 27 13:11:44 2007 +0000
@@ -12,14 +12,9 @@
     License, or (at your option) any later version.  See the file
     COPYING included with this distribution for more information.
 */
+#include "system/System.h"
 
-#include "CSVFileReader.h"
-
-#include "model/Model.h"
-#include "base/RealTime.h"
-#include "model/SparseOneDimensionalModel.h"
-#include "model/SparseTimeValueModel.h"
-#include "model/EditableDenseThreeDimensionalModel.h"
+#include <iostream>
 
 #include <QFile>
 #include <QString>
@@ -35,7 +30,13 @@
 #include <QComboBox>
 #include <QLabel>
 
-#include <iostream>
+#include "model/Model.h"
+#include "base/RealTime.h"
+#include "model/SparseOneDimensionalModel.h"
+#include "model/SparseTimeValueModel.h"
+#include "model/EditableDenseThreeDimensionalModel.h"
+
+#include "CSVFileReader.h"
 
 CSVFileReader::CSVFileReader(QString path, size_t mainModelSampleRate) :
     m_file(0),
@@ -354,8 +355,7 @@
 
     layout->addWidget(new QLabel(tr("\nExample data from file:")), 5, 0, 1, 4);
 
-    m_exampleWidget = new QTableWidget
-	(min(10, m_example.size()), m_maxExampleCols);
+    m_exampleWidget = new QTableWidget(MIN(10, m_example.size()), m_maxExampleCols);
 
     layout->addWidget(m_exampleWidget, 6, 0, 1, 4);
     layout->setColumnStretch(3, 10);
diff -r 56c167f3648a -r 6a31322cd9ed data/fileio/CSVFileReader.h
--- a/data/fileio/CSVFileReader.h	Tue Nov 27 13:11:19 2007 +0000
+++ b/data/fileio/CSVFileReader.h	Tue Nov 27 13:11:44 2007 +0000
@@ -16,12 +16,12 @@
 #ifndef _CSV_FILE_READER_H_
 #define _CSV_FILE_READER_H_
 
-#include "DataFileReader.h"
-
 #include <QList>
 #include <QStringList>
 #include <QDialog>
 
+#include "DataFileReader.h"
+
 class QFile;
 class QTableWidget;
 class QComboBox;