third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/union_serialization_definition.tmpl - Issue 890843003: Revert of Update mojo sdk to rev 8af2ccff2eee4bfca1043015abee30482a030b30

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/union_serialization_definition.tmpl

Issue 890843003: Revert of Update mojo sdk to rev 8af2ccff2eee4bfca1043015abee30482a030b30 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/union_definition.tmpl ('k') | third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/validation_macros.tmpl » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/union_serialization_definition.tmpl

diff --git a/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/union_serialization_definition.tmpl b/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/union_serialization_definition.tmpl

index 8b82f7f404206e492e905bf85c96a6f486628fb8..a29df078711d5d2666a2883d9440aeadd1896086 100644

--- a/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/union_serialization_definition.tmpl

+++ b/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/union_serialization_definition.tmpl

@@ -30,10 +30,9 @@

{% for field in union.fields %}

case {{union.name}}::Tag::{{field.name|upper}}:

{% if field.kind|is_string_kind %}

- {{field.kind|cpp_field_type}}* {{field.name}}_ptr = reinterpret_cast<{{field.kind|cpp_field_type}}*>(&result->data.f_{{field.name}});

- Serialize_(*(input_acc.data()->{{field.name}}), buf, &{{field.name}}_ptr->ptr);

+ Serialize_(input_acc.data()->{{field.name}}, buf, &result->data.{{field.name}}.ptr);

{% else %}

- result->data.f_{{field.name}} = input_acc.data()->{{field.name}};

+ result->data.{{field.name}} = input_acc.data()->{{field.name}};

{%- endif %}

break;

{%- endfor %}

@@ -54,10 +53,9 @@

case {{union.name}}::Tag::{{field.name|upper}}:

{% if field.kind|is_string_kind %}

result_acc.SwitchActive({{union.name}}::Tag::{{field.name|upper}});

- {{field.kind|cpp_field_type}}* {{field.name}}_ptr = reinterpret_cast<{{field.kind|cpp_field_type}}*>(&input->data.f_{{field.name}});

- Deserialize_({{field.name}}_ptr->ptr, result_acc.data()->{{field.name}});

+ Deserialize_(input->data.{{field.name}}.ptr, &result_acc.data()->{{field.name}});

{% else %}

- result->set_{{field.name}}(input->data.f_{{field.name}});

+ result->set_{{field.name}}(input->data.{{field.name}});

{%- endif %}

break;

{%- endfor %}