Mercurial > hg > svcore
diff data/fileio/CSVFileReader.cpp @ 847:2d53205f70cd tonioni
Merge from default branch
| author | Chris Cannam |
|---|---|
| date | Tue, 26 Nov 2013 14:37:01 +0000 |
| parents | f5cd33909744 |
| children | 69cc0454ed72 |
line wrap: on
line diff
--- a/data/fileio/CSVFileReader.cpp Fri Nov 22 10:37:28 2013 +0000 +++ b/data/fileio/CSVFileReader.cpp Tue Nov 26 14:37:01 2013 +0000 @@ -113,12 +113,12 @@ if (!ok) { if (m_warnings < warnLimit) { - std::cerr << "WARNING: CSVFileReader::load: " - << "Bad time format (\"" << s.toStdString() + cerr << "WARNING: CSVFileReader::load: " + << "Bad time format (\"" << s << "\") in data line " - << lineno+1 << std::endl; + << lineno+1 << endl; } else if (m_warnings == warnLimit) { - std::cerr << "WARNING: Too many warnings" << std::endl; + cerr << "WARNING: Too many warnings" << endl; } ++m_warnings; } @@ -332,15 +332,15 @@ if (!ok) { if (warnings < warnLimit) { - std::cerr << "WARNING: CSVFileReader::load: " + cerr << "WARNING: CSVFileReader::load: " << "Non-numeric value \"" - << list[i].toStdString() + << list[i] << "\" in data line " << lineno+1 - << ":" << std::endl; - std::cerr << line << std::endl; + << ":" << endl; + cerr << line << endl; ++warnings; } else if (warnings == warnLimit) { -// std::cerr << "WARNING: Too many warnings" << std::endl; +// cerr << "WARNING: Too many warnings" << endl; } } }