| commit | be7231018c61da3e5f51214aa5cf1ad8b194a8cd | [log] [tgz] |
|---|---|---|
| author | Lalit Maganti <lalitm@google.com> | Thu Dec 02 15:05:51 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 02 15:05:51 2021 +0000 |
| tree | b34f3b59b4b92f93ce117f394cbd616b96eb6519 | |
| parent | 5e965b81989d1d0fdf91d1936224b02d95f9c6f6 [diff] | |
| parent | 765c0f8ed116bafc3211cd52db4035e67061bcac [diff] |
Merge "GCC: fix ambiguous call to make_optional" am: 765c0f8ed1 Original change: https://android-review.googlesource.com/c/platform/external/perfetto/+/1907935 Change-Id: I51fd99611d59af226a444e6986ae76dc8ad1d70d
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