Merge branch 'compiling' of https://github.com/DaMichel/opentrack into unstable

Issue: #381

1 files changed, 2 insertions, 1 deletions

diff --git a/csv/csv.h b/csv/csv.h
index 06fe8d09..bb058586 100644
--- a/csv/csv.h
+++ b/csv/csv.h
@@ -25,5 +25,6 @@ private:
     int m_pos;
 
     static const QTextCodec* m_codec;
-    static const QRegExp m_rx, m_rx2;
+    static const QRegExp m_rx;
+    static const QRegExp m_rx2; // Silly M$ compiler! It will generate an error if both of these variables are declared on the same line! (M$ Visual Studio Community 2015, Update 3)
 };