# HG changeset patch # User Chris Cannam # Date 1526643728 -3600 # Node ID 0a56cf975768b65c216593cd089f1ef5dddd27ee # Parent ef03350baec7ba72e5465173de3e404e813753a4 Tie these down to try to avoid confusion from MSVC17 diff -r ef03350baec7 -r 0a56cf975768 runner/DefaultFeatureWriter.cpp --- a/runner/DefaultFeatureWriter.cpp Fri May 18 11:27:02 2018 +0100 +++ b/runner/DefaultFeatureWriter.cpp Fri May 18 12:42:08 2018 +0100 @@ -16,8 +16,6 @@ #include #include -using namespace std; - #include "DefaultFeatureWriter.h" string @@ -48,35 +46,35 @@ for (int i = 0; i < (int)featureList.size(); ++i) { if (summaryType == "") { - cout << "" << endl; + std::cout << "" << std::endl; } else { - cout << "" << endl; + std::cout << "" << std::endl; } - cout << "\t" << output.name << "" << endl; + std::cout << "\t" << output.name << "" << std::endl; if (featureList[i].hasTimestamp) { - cout << "\t" << featureList[i].timestamp << "" << endl; + std::cout << "\t" << featureList[i].timestamp << "" << std::endl; } if (featureList[i].hasDuration) { - cout << "\t" << featureList[i].duration << "" << endl; + std::cout << "\t" << featureList[i].duration << "" << std::endl; } if (featureList[i].values.size() > 0) { - cout << "\t"; + std::cout << "\t"; for (int j = 0; j < (int)featureList[i].values.size(); ++j) { if (j > 0) - cout << " "; + std::cout << " "; if (output.binNames.size() > 0) - cout << output.binNames[j] << ":"; - cout << featureList[i].values[j]; + std::cout << output.binNames[j] << ":"; + std::cout << featureList[i].values[j]; } - cout << "" << endl; + std::cout << "" << std::endl; } if (featureList[i].label.length() > 0) - cout << "\t" << endl; + std::cout << "\t" << std::endl; if (summaryType == "") { - cout << "" << endl; + std::cout << "" << std::endl; } else { - cout << "" << endl; + std::cout << "" << std::endl; } } }