Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(362)

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

Issue 1127293003: Update mojo sdk to rev f84766d3b6420b7cf6a113d9d65d73cb5fe18d90 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: formatting Created 5 years, 7 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
Index: third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/union_declaration.tmpl
diff --git a/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/union_declaration.tmpl b/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/union_declaration.tmpl
index f84f60a73015a2f1e7954cccdc986bd5de32c268..8c0e89c0c271693f96d177d978b39bf448148a72 100644
--- a/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/union_declaration.tmpl
+++ b/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/union_declaration.tmpl
@@ -32,14 +32,10 @@ class {{class_name}} {
// a struct." - Section 9.5.2 ISO/IEC 14882:2011 (The C++ Spec)
union MOJO_ALIGNAS(8) Union_ {
{%- for field in union.fields %}
-{%- if field.kind|is_object_kind %}
- uint64_t f_{{field.name}};
-{%- elif field.kind.spec == 'b' %}
+{%- if field.kind.spec == 'b' %}
uint8_t f_{{field.name}} : 1;
-{%- elif field.kind|is_enum_kind %}
- int32_t f_{{field.name}};
{%- else %}
- {{field.kind|cpp_pod_type}} f_{{field.name}};
+ {{field.kind|cpp_union_field_type}} f_{{field.name}};
{%- endif %}
{%- endfor %}
uint64_t unknown;

Powered by Google App Engine
This is Rietveld 408576698