perfetto: switch base::Optional to std::optional
Now that base::Optional is simply a shim for std::optional and it's
stuck without being reverted, migrate everything over to use
std::optional directly.
Change-Id: Ic2595fc1cfae8f3b62350f8bf206675c709894a1
diff --git a/python/generators/trace_processor_table/serialize.py b/python/generators/trace_processor_table/serialize.py
index 4aee5b5..0a8715c 100644
--- a/python/generators/trace_processor_table/serialize.py
+++ b/python/generators/trace_processor_table/serialize.py
@@ -462,15 +462,15 @@
{self.foreach_col(ColumnSerializer.shrink_to_fit)}
}}
- base::Optional<ConstRowReference> FindById(Id find_id) const {{
- base::Optional<uint32_t> row = id().IndexOf(find_id);
- return row ? base::make_optional(ConstRowReference(this, *row))
- : base::nullopt;
+ std::optional<ConstRowReference> FindById(Id find_id) const {{
+ std::optional<uint32_t> row = id().IndexOf(find_id);
+ return row ? std::make_optional(ConstRowReference(this, *row))
+ : std::nullopt;
}}
- base::Optional<RowReference> FindById(Id find_id) {{
- base::Optional<uint32_t> row = id().IndexOf(find_id);
- return row ? base::make_optional(RowReference(this, *row)) : base::nullopt;
+ std::optional<RowReference> FindById(Id find_id) {{
+ std::optional<uint32_t> row = id().IndexOf(find_id);
+ return row ? std::make_optional(RowReference(this, *row)) : std::nullopt;
}}
IdAndRow Insert(const Row& row) {{
diff --git a/python/generators/trace_processor_table/util.py b/python/generators/trace_processor_table/util.py
index b6c38d8..015f02c 100644
--- a/python/generators/trace_processor_table/util.py
+++ b/python/generators/trace_processor_table/util.py
@@ -62,7 +62,7 @@
else:
cpp_type = self.cpp_type
if self.is_optional:
- return f'base::Optional<{cpp_type}>'
+ return f'std::optional<{cpp_type}>'
return cpp_type
