diff options
| author | Martin Hořeňovský | 2019-08-07 09:12:38 +0200 |
|---|---|---|
| committer | GitHub | 2019-08-07 09:12:38 +0200 |
| commit | fa096b26d129dc8f0621995a80dd2b84eee86645 (patch) | |
| tree | a33c1a4c9d24be15f386bb16c7e7fc15d40843e7 /include | |
| parent | 6070745cab45a0f2284c56d5e2a1eed444447f88 (diff) | |
| parent | 3d9e7db2e0fff8fc2edcf59d24351f3937e3ac62 (diff) | |
| download | catch3-fa096b26d129dc8f0621995a80dd2b84eee86645.tar.gz | |
Merge pull request #1715 from sfranzen/fix-compact-reporter
Fix infinite loop in compact reporter printer
Diffstat (limited to 'include')
| -rw-r--r-- | include/reporters/catch_reporter_compact.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/include/reporters/catch_reporter_compact.cpp b/include/reporters/catch_reporter_compact.cpp index 65f70266..6101d6c5 100644 --- a/include/reporters/catch_reporter_compact.cpp +++ b/include/reporters/catch_reporter_compact.cpp @@ -209,24 +209,25 @@ private: if (itMessage == messages.end()) return; - // using messages.end() directly yields (or auto) compilation error: - std::vector<MessageInfo>::const_iterator itEnd = messages.end(); - const std::size_t N = static_cast<std::size_t>(std::distance(itMessage, itEnd)); + const auto itEnd = messages.cend(); + const auto N = static_cast<std::size_t>(std::distance(itMessage, itEnd)); { Colour colourGuard(colour); stream << " with " << pluralise(N, "message") << ':'; } - for (; itMessage != itEnd; ) { + while (itMessage != itEnd) { // If this assertion is a warning ignore any INFO messages if (printInfoMessages || itMessage->type != ResultWas::Info) { - stream << " '" << itMessage->message << '\''; - if (++itMessage != itEnd) { + printMessage(); + if (itMessage != itEnd) { Colour colourGuard(dimColour()); stream << " and"; } + continue; } + ++itMessage; } } |