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

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

Issue 910883002: Update mojo sdk to rev 8af2ccff2eee4bfca1043015abee30482a030b30 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Apply 9f87aeadbda22441b7d469e596f7bd7d0d73e2a8 (https://codereview.chromium.org/908973002/) 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
Index: third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/module.cc.tmpl
diff --git a/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/module.cc.tmpl b/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/module.cc.tmpl
index 1ddcc45c39dde0f3b5a783901c988ec10c8a0942..863d18fe4bb8e13082a31e2ff04ace901c551446 100644
--- a/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/module.cc.tmpl
+++ b/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/module.cc.tmpl
@@ -8,6 +8,7 @@
#elif defined(_MSC_VER)
#pragma warning(push)
#pragma warning(disable:4056)
+#pragma warning(disable:4065)
#pragma warning(disable:4756)
#endif
@@ -63,6 +64,11 @@ const uint32_t {{method_name}} = {{method.ordinal}};
{%- include "struct_definition.tmpl" %}
{%- endfor %}
+{#--- Union definitions #}
+{% for union in unions %}
+{%- include "union_definition.tmpl" %}
+{%- endfor %}
+
} // namespace internal
{#--- Struct Constants #}
@@ -77,6 +83,11 @@ const {{constant.kind|cpp_pod_type}} {{struct.name}}::{{constant.name}} = {{cons
{%- include "wrapper_class_definition.tmpl" %}
{%- endfor %}
+{#--- Union builder definitions #}
+{%- for union in unions %}
+{%- include "wrapper_union_class_definition.tmpl" %}
+{%- endfor %}
+
{#--- Interface definitions #}
{%- for interface in interfaces %}
{%- include "interface_definition.tmpl" %}
@@ -87,6 +98,11 @@ const {{constant.kind|cpp_pod_type}} {{struct.name}}::{{constant.name}} = {{cons
{%- include "struct_serialization_definition.tmpl" %}
{%- endfor %}
+{#--- Union Serialization Helpers #}
+{%- for union in unions %}
+{%- include "union_serialization_definition.tmpl" %}
+{%- endfor %}
+
{%- for namespace in namespaces_as_array|reverse %}
} // namespace {{namespace}}
{%- endfor %}

Powered by Google App Engine
This is Rietveld 408576698