mojo/public/tools/bindings/generators/cpp_templates/module-internal.h.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/module-internal.h.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/cpp/bindings/tests/union_unittest.cc ('K') | « mojo/public/interfaces/bindings/tests/test_unions.mojom ('k') | mojo/public/tools/bindings/generators/cpp_templates/module.h.tmpl » ('j') | mojo/public/tools/bindings/generators/cpp_templates/struct_macros.tmpl » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: mojo/public/tools/bindings/generators/cpp_templates/module-internal.h.tmpl

diff --git a/mojo/public/tools/bindings/generators/cpp_templates/module-internal.h.tmpl b/mojo/public/tools/bindings/generators/cpp_templates/module-internal.h.tmpl

index d9a398a193c2d4d4f8518444663c97e9ddd02ec0..b4b4df825bcd6385b1f16d74edf82dc3b4397fbd 100644

--- a/mojo/public/tools/bindings/generators/cpp_templates/module-internal.h.tmpl

+++ b/mojo/public/tools/bindings/generators/cpp_templates/module-internal.h.tmpl

@@ -50,15 +50,17 @@ class {{union.name}}_Data;

#pragma pack(push, 1)

+{#--- Unions must be declared first because they can be members of structs #}

+{#--- Union class declarations #}

+{% for union in unions %}

+{% include "union_declaration.tmpl" %}

+{%- endfor %}

{#--- Class declarations #}

{% for struct in structs %}

{% include "struct_declaration.tmpl" %}

{%- endfor %}

-{% for union in unions %}

-{% include "union_declaration.tmpl" %}

-{%- endfor %}

#pragma pack(pop)

} // namespace internal