| commit | 765c0f8ed116bafc3211cd52db4035e67061bcac | [log] [tgz] |
|---|---|---|
| author | Lalit Maganti <lalitm@google.com> | Thu Dec 02 14:23:41 2021 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Dec 02 14:23:41 2021 +0000 |
| tree | b34f3b59b4b92f93ce117f394cbd616b96eb6519 | |
| parent | 2f654ea47bf780f16e9c56fe3632fe8797b5cbcd [diff] | |
| parent | 611804d1cc9d381820d816112d79043e48afa8f5 [diff] |
Merge "GCC: fix ambiguous call to make_optional"
diff --git a/src/base/base64.cc b/src/base/base64.cc index 437ad67..bb2e3c4 100644 --- a/src/base/base64.cc +++ b/src/base/base64.cc
@@ -146,7 +146,7 @@ PERFETTO_CHECK(res <= static_cast<ssize_t>(dst.size())); dst.resize(static_cast<size_t>(res)); - return make_optional(dst); + return base::make_optional(dst); } } // namespace base