aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2020-12-01 17:09:26 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2020-12-01 17:09:26 +0000
commitcb0ad317874e8c8e2dd03b93666fb090f8ebb8f1 (patch)
tree4173df5eb0231ba728cf6d63806acc97adf0ab8d
parent80cf70e2731050675fd83dee7e807559b370fdc0 (diff)
parent9712b96bb9d111731155ee8b78c4aa7d894b873d (diff)
downloadperfetto-cb0ad317874e8c8e2dd03b93666fb090f8ebb8f1.tar.gz
Merge "base: GCC compatibility fix"
-rw-r--r--include/perfetto/ext/base/string_writer.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/perfetto/ext/base/string_writer.h b/include/perfetto/ext/base/string_writer.h
index 428b17e84..07ba24a93 100644
--- a/include/perfetto/ext/base/string_writer.h
+++ b/include/perfetto/ext/base/string_writer.h
@@ -154,7 +154,9 @@ class StringWriter {
if (padding > 0) {
size_t num_digits = kSizeNeeded - 1 - idx;
- for (size_t i = num_digits; i < padding; i++) {
+ // std::max() needed to work around GCC not being able to tell that
+ // padding > 0.
+ for (size_t i = num_digits; i < std::max(uint64_t{1u}, padding); i++) {
data[idx--] = padchar;
}
}