mirror of
https://github.com/google/googletest.git
synced 2025-01-14 00:20:57 +08:00
Internal Code Change
PiperOrigin-RevId: 518213370 Change-Id: I88d0acc195dadf8d03cd15c8534c721141db14ea
This commit is contained in:
parent
fa87209829
commit
e9faae170f
@ -563,7 +563,7 @@ namespace internal {
|
||||
// If the explanation is not empty, prints it to the ostream.
|
||||
inline void PrintIfNotEmpty(const std::string& explanation,
|
||||
::std::ostream* os) {
|
||||
if (explanation != "" && os != nullptr) {
|
||||
if (!explanation.empty() && os != nullptr) {
|
||||
*os << ", " << explanation;
|
||||
}
|
||||
}
|
||||
@ -2966,7 +2966,7 @@ class KeyMatcherImpl : public MatcherInterface<PairType> {
|
||||
const bool match = inner_matcher_.MatchAndExplain(
|
||||
pair_getters::First(key_value, Rank0()), &inner_listener);
|
||||
const std::string explanation = inner_listener.str();
|
||||
if (explanation != "") {
|
||||
if (!explanation.empty()) {
|
||||
*listener << "whose first field is a value " << explanation;
|
||||
}
|
||||
return match;
|
||||
@ -3113,12 +3113,12 @@ class PairMatcherImpl : public MatcherInterface<PairType> {
|
||||
const std::string& second_explanation,
|
||||
MatchResultListener* listener) const {
|
||||
*listener << "whose both fields match";
|
||||
if (first_explanation != "") {
|
||||
if (!first_explanation.empty()) {
|
||||
*listener << ", where the first field is a value " << first_explanation;
|
||||
}
|
||||
if (second_explanation != "") {
|
||||
if (!second_explanation.empty()) {
|
||||
*listener << ", ";
|
||||
if (first_explanation != "") {
|
||||
if (!first_explanation.empty()) {
|
||||
*listener << "and ";
|
||||
} else {
|
||||
*listener << "where ";
|
||||
|
Loading…
x
Reference in New Issue
Block a user