Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
path: root/src/catch2/catch_message.cpp
diff options
context:
space:
mode:
authoroffa2020-01-21 21:04:42 +0100
committerMartin Hořeňovský2020-02-16 15:25:23 +0100
commit06c32862b3d7d20544ba876e590e799667b3afa8 (patch)
tree3f15b5a7abc220c562c353f128c989ba312f782f /src/catch2/catch_message.cpp
parentab520f4e97ad5e9b01c0f08cda868d9690d35aff (diff)
downloadcatch3-06c32862b3d7d20544ba876e590e799667b3afa8.tar.gz
Some refactorings:
- Overrides added - usages of push_back() replaced with emplace_back() - Loop variable made const-refernce - NULL replaced with nullptr - Names used in the declaration and definition unified - size() replaced with empty - Identical cases merged
Diffstat (limited to 'src/catch2/catch_message.cpp')
-rw-r--r--src/catch2/catch_message.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/catch2/catch_message.cpp b/src/catch2/catch_message.cpp
index bd0b60ba..24cd789b 100644
--- a/src/catch2/catch_message.cpp
+++ b/src/catch2/catch_message.cpp
@@ -111,7 +111,7 @@ namespace Catch {
pos = skipq(pos, c);
break;
case ',':
- if (start != pos && openings.size() == 0) {
+ if (start != pos && openings.empty()) {
m_messages.emplace_back(macroName, lineInfo, resultType);
m_messages.back().message = static_cast<std::string>(trimmed(start, pos));
m_messages.back().message += " := ";
@@ -119,7 +119,7 @@ namespace Catch {
}
}
}
- assert(openings.size() == 0 && "Mismatched openings");
+ assert(openings.empty() && "Mismatched openings");
m_messages.emplace_back(macroName, lineInfo, resultType);
m_messages.back().message = static_cast<std::string>(trimmed(start, names.size() - 1));
m_messages.back().message += " := ";