Index: mojo/public/tools/bindings/generators/cpp_templates/struct_serialization_definition.tmpl |
diff --git a/mojo/public/tools/bindings/generators/cpp_templates/struct_serialization_definition.tmpl b/mojo/public/tools/bindings/generators/cpp_templates/struct_serialization_definition.tmpl |
index 5d8b944fb1a5a359b29ab36245dfa39b1cec890c..f48cca72fb45734058cf6eda9554dc674c2d671a 100644 |
--- a/mojo/public/tools/bindings/generators/cpp_templates/struct_serialization_definition.tmpl |
+++ b/mojo/public/tools/bindings/generators/cpp_templates/struct_serialization_definition.tmpl |
@@ -18,7 +18,7 @@ void Serialize_({{struct.name}}Ptr input, mojo::internal::Buffer* buf, |
Serialize_(mojo::internal::Forward(input->{{pf.field.name}}), buf, &result->{{pf.field.name}}.ptr); |
{%- elif pf.field.kind|is_interface_kind %} |
result->{{pf.field.name}} = input->{{pf.field.name}}.PassMessagePipe().release(); |
-{%- elif pf.field.kind|is_handle_kind %} |
+{%- elif pf.field.kind|is_any_handle_kind %} |
result->{{pf.field.name}} = input->{{pf.field.name}}.release(); |
{%- else %} |
result->{{pf.field.name}} = input->{{pf.field.name}}; |
@@ -40,7 +40,7 @@ void Deserialize_(internal::{{struct.name}}_Data* input, |
{%- elif pf.field.kind|is_interface_kind %} |
if (input->{{pf.field.name}}.is_valid()) |
result->{{pf.field.name}}.Bind(mojo::MakeScopedHandle(mojo::internal::FetchAndReset(&input->{{pf.field.name}}))); |
-{%- elif pf.field.kind|is_handle_kind %} |
+{%- elif pf.field.kind|is_any_handle_kind %} |
result->{{pf.field.name}}.reset(mojo::internal::FetchAndReset(&input->{{pf.field.name}})); |
{%- elif pf.field.kind|is_enum_kind %} |
result->{{pf.field.name}} = static_cast<{{pf.field.kind|cpp_wrapper_type}}>( |