Mercurial > hg > sonic-annotator
changeset 326:0a56cf975768
Tie these down to try to avoid confusion from MSVC17
author | Chris Cannam |
---|---|
date | Fri, 18 May 2018 12:42:08 +0100 |
parents | ef03350baec7 |
children | 0e866ef12d87 |
files | runner/DefaultFeatureWriter.cpp |
diffstat | 1 files changed, 13 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- 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 <iostream> #include <map> -using namespace std; - #include "DefaultFeatureWriter.h" string @@ -48,35 +46,35 @@ for (int i = 0; i < (int)featureList.size(); ++i) { if (summaryType == "") { - cout << "<feature>" << endl; + std::cout << "<feature>" << std::endl; } else { - cout << "<summary type=\"" << summaryType << "\">" << endl; + std::cout << "<summary type=\"" << summaryType << "\">" << std::endl; } - cout << "\t<name>" << output.name << "</name>" << endl; + std::cout << "\t<name>" << output.name << "</name>" << std::endl; if (featureList[i].hasTimestamp) { - cout << "\t<timestamp>" << featureList[i].timestamp << "</timestamp>" << endl; + std::cout << "\t<timestamp>" << featureList[i].timestamp << "</timestamp>" << std::endl; } if (featureList[i].hasDuration) { - cout << "\t<duration>" << featureList[i].duration << "</duration>" << endl; + std::cout << "\t<duration>" << featureList[i].duration << "</duration>" << std::endl; } if (featureList[i].values.size() > 0) { - cout << "\t<values>"; + std::cout << "\t<values>"; 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 << "</values>" << endl; + std::cout << "</values>" << std::endl; } if (featureList[i].label.length() > 0) - cout << "\t<label>" << featureList[i].label << "</label>" << endl; + std::cout << "\t<label>" << featureList[i].label << "</label>" << std::endl; if (summaryType == "") { - cout << "</feature>" << endl; + std::cout << "</feature>" << std::endl; } else { - cout << "</summary>" << endl; + std::cout << "</summary>" << std::endl; } } }