Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(716)

Unified Diff: third_party/re2/re2/testing/string_generator.cc

Issue 1516543002: Update re2 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: updated update instructions Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/re2/re2/testing/string_generator.h ('k') | third_party/re2/re2/testing/tester.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/re2/re2/testing/string_generator.cc
diff --git a/third_party/re2/re2/testing/string_generator.cc b/third_party/re2/re2/testing/string_generator.cc
index 5be6d3eb5d9002c9518199e02aba628a6915164c..f96ff208dba4d356acb82d117d22f6d35b2170be 100644
--- a/third_party/re2/re2/testing/string_generator.cc
+++ b/third_party/re2/re2/testing/string_generator.cc
@@ -43,14 +43,14 @@ void StringGenerator::Reset() {
// Returns false if all the numbers have been used.
bool StringGenerator::IncrementDigits() {
// First try to increment the current number.
- for (int i = digits_.size() - 1; i >= 0; i--) {
- if (++digits_[i] < alphabet_.size())
+ for (int i = static_cast<int>(digits_.size()) - 1; i >= 0; i--) {
+ if (++digits_[i] < static_cast<int>(alphabet_.size()))
return true;
digits_[i] = 0;
}
// If that failed, make a longer number.
- if (digits_.size() < maxlen_) {
+ if (static_cast<int>(digits_.size()) < maxlen_) {
digits_.push_back(0);
return true;
}
@@ -68,7 +68,7 @@ bool StringGenerator::RandomDigits() {
int len = acm_->Uniform(maxlen_+1);
digits_.resize(len);
for (int i = 0; i < len; i++)
- digits_[i] = acm_->Uniform(alphabet_.size());
+ digits_[i] = acm_->Uniform(static_cast<int32>(alphabet_.size()));
return true;
}
@@ -84,7 +84,7 @@ const StringPiece& StringGenerator::Next() {
return sp_;
}
s_.clear();
- for (int i = 0; i < digits_.size(); i++) {
+ for (size_t i = 0; i < digits_.size(); i++) {
s_ += alphabet_[digits_[i]];
}
hasnext_ = random_ ? RandomDigits() : IncrementDigits();
@@ -110,4 +110,3 @@ void StringGenerator::GenerateNULL() {
}
} // namespace re2
-
« no previous file with comments | « third_party/re2/re2/testing/string_generator.h ('k') | third_party/re2/re2/testing/tester.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698