| Index: third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/module.h.tmpl
|
| diff --git a/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/module.h.tmpl b/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/module.h.tmpl
|
| index 03120024fda3dda88c0df3f02b8b85892323b5a4..25449b7ca959bf481262ee2cb8024faca338ae0b 100644
|
| --- a/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/module.h.tmpl
|
| +++ b/third_party/mojo/src/mojo/public/tools/bindings/generators/cpp_templates/module.h.tmpl
|
| @@ -53,16 +53,6 @@
|
| {% endif %}
|
| {% endfor %}
|
|
|
| -{#--- Union Forward Declarations -#}
|
| -{% for union in unions %}
|
| -class {{union.name}};
|
| -{% if union|should_inline_union %}
|
| -typedef mojo::InlinedStructPtr<{{union.name}}> {{union.name}}Ptr;
|
| -{% else %}
|
| -typedef mojo::StructPtr<{{union.name}}> {{union.name}}Ptr;
|
| -{% endif %}
|
| -{%- endfor %}
|
| -
|
| {#--- NOTE: Non-inlined structs may have pointers to inlined structs, so we #}
|
| {#--- need to fully define inlined structs ahead of the others. #}
|
|
|
| @@ -78,11 +68,6 @@
|
| {% if not struct|should_inline %}
|
| {% include "wrapper_class_declaration.tmpl" %}
|
| {% endif %}
|
| -{%- endfor %}
|
| -
|
| -{#--- Unions #}
|
| -{% for union in unions %}
|
| -{% include "wrapper_union_class_declaration.tmpl" %}
|
| {%- endfor %}
|
|
|
| {#--- Interfaces -#}
|
| @@ -110,18 +95,10 @@
|
| {% include "interface_response_validator_declaration.tmpl" %}
|
| {%- endfor %}
|
|
|
| -{%- import "serialization_macros.tmpl" as serialization_macros %}
|
| {#--- Struct Serialization Helpers -#}
|
| {% if structs %}
|
| {% for struct in structs %}
|
| -{{ serialization_macros.declare_serialization(struct.name) }}
|
| -{%- endfor %}
|
| -{%- endif %}
|
| -
|
| -{#--- Union Serialization Helpers -#}
|
| -{% if unions %}
|
| -{% for union in unions %}
|
| -{{ serialization_macros.declare_serialization(union.name) }}
|
| +{% include "struct_serialization_declaration.tmpl" %}
|
| {%- endfor %}
|
| {%- endif %}
|
|
|
|
|