Mercurial > hg > svcore

changeset 1697:c077a97d055f single-point

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Windows build fixes
author Chris Cannam
date Wed, 01 May 2019 21:39:37 +0100
parents 187c76c40c6f
children ad33d6c10738
files base/test/StressEventSeries.h data/model/test/TestSparseModels.h data/osc/OSCQueue.cpp
diffstat 3 files changed, 7 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/base/test/StressEventSeries.h	Wed May 01 11:45:28 2019 +0100
+++ b/base/test/StressEventSeries.h	Wed May 01 21:39:37 2019 +0100
@@ -34,7 +34,7 @@
         cerr << "                 " << message;
         for (int i = 0; i < 34 - message.size(); ++i) cerr << " ";
         cerr << double(end - start) * 1000.0 / double(CLOCKS_PER_SEC)
-             << "ms" << endl;
+             << "ms" << std::endl;
     }        
     
     void short_n(int n) {
--- a/data/model/test/TestSparseModels.h	Wed May 01 11:45:28 2019 +0100
+++ b/data/model/test/TestSparseModels.h	Wed May 01 21:39:37 2019 +0100
@@ -132,7 +132,7 @@
         expected.replace("\'", "\"");
         if (xml != expected) {
             cerr << "Obtained xml:\n" << xml
-                 << "\nExpected:\n" << expected << endl;
+                 << "\nExpected:\n" << expected << std::endl;
         }
         QCOMPARE(xml, expected);
     }
@@ -218,7 +218,7 @@
         expected.replace("\'", "\"");
         if (xml != expected) {
             cerr << "Obtained xml:\n" << xml
-                 << "\nExpected:\n" << expected << endl;
+                 << "\nExpected:\n" << expected << std::endl;
         }
         QCOMPARE(xml, expected);
     }
@@ -246,7 +246,7 @@
         expected.replace("\'", "\"");
         if (xml != expected) {
             cerr << "Obtained xml:\n" << xml
-                 << "\nExpected:\n" << expected << endl;
+                 << "\nExpected:\n" << expected << std::endl;
         }
         QCOMPARE(xml, expected);
     }
@@ -274,7 +274,7 @@
         expected.replace("\'", "\"");
         if (xml != expected) {
             cerr << "Obtained xml:\n" << xml
-                 << "\nExpected:\n" << expected << endl;
+                 << "\nExpected:\n" << expected << std::endl;
         }
         QCOMPARE(xml, expected);
     }
@@ -296,7 +296,7 @@
         expected.replace("\'", "\"");
         if (xml != expected) {
             cerr << "Obtained xml:\n" << xml
-                 << "\nExpected:\n" << expected << endl;
+                 << "\nExpected:\n" << expected << std::endl;
         }
         QCOMPARE(xml, expected);
     }
--- a/data/osc/OSCQueue.cpp	Wed May 01 11:45:28 2019 +0100
+++ b/data/osc/OSCQueue.cpp	Wed May 01 21:39:37 2019 +0100
@@ -23,6 +23,7 @@
 #include "base/Profiler.h"
 
 #include <iostream>
+#include <QThread>
 
 #define OSC_MESSAGE_QUEUE_SIZE 1023
 
@@ -30,8 +31,6 @@
 
 #include <unistd.h>
 
-#include <QThread>
-
 void
 OSCQueue::oscError(int num, const char *msg, const char *path)
 {