# HG changeset patch # User Chris Cannam # Date 1556743177 -3600 # Node ID c077a97d055f6f11261359ab0a79a790466cc82a # Parent 187c76c40c6f2574f17c471bc5a11ab74ffc51af Windows build fixes diff -r 187c76c40c6f -r c077a97d055f base/test/StressEventSeries.h --- 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) { diff -r 187c76c40c6f -r c077a97d055f data/model/test/TestSparseModels.h --- 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); } diff -r 187c76c40c6f -r c077a97d055f data/osc/OSCQueue.cpp --- 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 +#include #define OSC_MESSAGE_QUEUE_SIZE 1023 @@ -30,8 +31,6 @@ #include -#include - void OSCQueue::oscError(int num, const char *msg, const char *path) {