mojo/public/tools/bindings/generators/cpp_templates/wrapper_class_definition.tmpl - Issue 923033003: Implement unions as members of structs.

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: mojo/public/tools/bindings/generators/cpp_templates/wrapper_class_definition.tmpl

Issue 923033003: Implement unions as members of structs. (Closed) Base URL: https://github.com/domokit/mojo.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

« mojo/public/tools/bindings/generators/cpp_templates/union_serialization_definition.tmpl ('K') | « mojo/public/tools/bindings/generators/cpp_templates/union_serialization_definition.tmpl ('k') | mojo/public/tools/bindings/generators/mojom_cpp_generator.py » ('j') | mojo/public/tools/bindings/generators/mojom_cpp_generator.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: mojo/public/tools/bindings/generators/cpp_templates/wrapper_class_definition.tmpl

diff --git a/mojo/public/tools/bindings/generators/cpp_templates/wrapper_class_definition.tmpl b/mojo/public/tools/bindings/generators/cpp_templates/wrapper_class_definition.tmpl

index da93e076b4faf374af2edd39312773817b2c181d..249f51fe85d3dca9efde7ab1e9e4343dcc72fbb1 100644

--- a/mojo/public/tools/bindings/generators/cpp_templates/wrapper_class_definition.tmpl

+++ b/mojo/public/tools/bindings/generators/cpp_templates/wrapper_class_definition.tmpl

@@ -18,7 +18,7 @@

{{struct.name}}Ptr {{struct.name}}::Clone() const {

{{struct.name}}Ptr rv(New());

{%- for field in struct.fields %}

-{%- if field.kind|is_struct_kind or field.kind|is_array_kind or field.kind|is_map_kind %}

+{%- if field.kind|is_struct_kind or field.kind|is_array_kind or field.kind|is_map_kind or field.kind|is_union_kind %}

yzshen1 2015/02/17 19:34:35 Maybe we should say "is object but not string", no

azani 2015/02/18 00:27:58 Done.

rv->{{field.name}} = {{field.name}}.Clone();

{%- else %}

rv->{{field.name}} = {{field.name}};