3party/googletest
0
0
Fork 0
mirror of https://github.com/google/googletest.git synced 2024-12-29 03:33:40 +08:00
Code Issues Projects Releases Wiki Activity

Apply requested changes by using std::inserter with move.

Browse Source
This commit is contained in:
Hossein Ghahramanzadeh 2022-02-05 17:43:21 +01:00
parent 2eadda6e00
commit d6841c040d
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
googletest/src/gtest.cc
View File

@ -726,13 +726,13 @@ static bool PatternMatchesString(const std::string& name_str,
return true; return true;
} }
static bool IsGlobPattern(const std::string& pattern) { namespace {
bool IsGlobPattern(const std::string& pattern) {
return std::any_of(pattern.begin(), pattern.end(), return std::any_of(pattern.begin(), pattern.end(),
[](const char c) { return c == '?' || c == '*'; }); [](const char c) { return c == '?' || c == '*'; });
} }
namespace {
class UnitTestFilter { class UnitTestFilter {
public: public:
UnitTestFilter() = default; UnitTestFilter() = default;
@ -740,12 +740,14 @@ class UnitTestFilter {
// Constructs a filter from a string of patterns separated by `:`. // Constructs a filter from a string of patterns separated by `:`.
explicit UnitTestFilter(const std::string& filter) { explicit UnitTestFilter(const std::string& filter) {
// By design "" filter matches "" string. // By design "" filter matches "" string.
SplitString(filter, ':', &glob_patterns_); std::vector<std::string> all_patterns;
const auto exact_match_pattern_begin = std::partition( SplitString(filter, ':', &all_patterns);
glob_patterns_.begin(), glob_patterns_.end(), &IsGlobPattern); const auto exact_match_patterns_begin = std::partition(
exact_match_patterns_.insert(exact_match_pattern_begin, all_patterns.begin(), all_patterns.end(), &IsGlobPattern);
glob_patterns_.end());
glob_patterns_.erase(exact_match_pattern_begin, glob_patterns_.end()); glob_patterns_.reserve(exact_match_patterns_begin - all_patterns.begin());
std::move(all_patterns.begin(), exact_match_patterns_begin, std::inserter(glob_patterns_, glob_patterns_.begin()));
std::move(exact_match_patterns_begin, all_patterns.end(), std::inserter(exact_match_patterns_, exact_match_patterns_.begin()));
} }
// Returns true if and only if name matches at least one of the patterns in // Returns true if and only if name matches at least one of the patterns in