Mercurial > hg > svcore
diff data/fileio/CSVFileReader.cpp @ 843:e802e550a1f2
Drop std:: from cout, cerr, endl -- pull these in through Debug.h
| author | Chris Cannam |
|---|---|
| date | Tue, 26 Nov 2013 13:35:08 +0000 |
| parents | 1424aa29ae95 |
| children | f5cd33909744 |
line wrap: on
line diff
--- a/data/fileio/CSVFileReader.cpp Tue Nov 26 11:16:37 2013 +0000 +++ b/data/fileio/CSVFileReader.cpp Tue Nov 26 13:35:08 2013 +0000 @@ -113,12 +113,12 @@ if (!ok) { if (m_warnings < warnLimit) { - std::cerr << "WARNING: CSVFileReader::load: " + cerr << "WARNING: CSVFileReader::load: " << "Bad time format (\"" << s.toStdString() << "\") 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() << "\" 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; } } }