Mojo C++ bindings: more consistent Clone() and Equals().

mojo/public/tools/bindings/generators/cpp_templates/module.h.tmpl

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 {%- if variant -%}
 {%-   set variant_path = "%s-%s"|format(module.path, variant) -%}
 {%- else -%}
 {%-   set variant_path = module.path -%}
 {%- endif -%}
 
@@ skipping 151 matching lines @@
 {#--- Interface Request Validators -#}
 {%  for interface in interfaces %}
 {%    include "interface_request_validator_declaration.tmpl" %}
 {%- endfor %}
 
 {#--- Interface Response Validators -#}
 {%  for interface in interfaces if interface|has_callbacks %}
 {%    include "interface_response_validator_declaration.tmpl" %}
 {%- endfor %}
 
-{#--- Unions must be declared first because they can be members of structs #}
-{#--- Unions #}
-{%  for union in unions %}
-{%    include "wrapper_union_class_declaration.tmpl" %}
-{%- endfor %}
-
-{#--- NOTE: Non-inlined structs may have pointers to inlined structs, so we  #}
-{#---       need to fully define inlined structs ahead of the others.        #}
+{#--- NOTE: Unions and non-inlined structs may have pointers to inlined structs,
+      so we need to fully define inlined structs ahead of the others. #}
 
 {#--- Inlined structs #}
 {%  for struct in structs %}
 {%    if struct|should_inline and not struct|is_native_only_kind %}
 {%      include "wrapper_class_declaration.tmpl" %}
 {%      include "struct_data_view_declaration.tmpl" %}
 {%    endif %}
 {%- endfor %}
 
+{#--- Unions must be declared before non-inlined structs because they can be
+      members of structs. #}
+{#--- Unions #}
+{%  for union in unions %}
+{%    include "wrapper_union_class_declaration.tmpl" %}
+{%- endfor %}
+
 {#--- Non-inlined structs #}
 {%  for struct in structs %}
 {%    if not struct|should_inline and not struct|is_native_only_kind %}
 {%      include "wrapper_class_declaration.tmpl" %}
 {%      include "struct_data_view_declaration.tmpl" %}
 {%    endif %}
 {%- endfor %}
 
+{%- for union in unions %}
+{%    include "wrapper_union_class_template_definition.tmpl" %}
+{%- endfor %}
+
 {%- for struct in structs %}
+{%-   if not struct|is_native_only_kind %}
+{%      include "wrapper_class_template_definition.tmpl" %}
+{%-   endif %}
+
 {%-   for enum in struct.enums %}
 {{enum_stream_operator(enum)}}
 {{is_known_enum_value(enum)}}
 {%-   endfor %}
 {%- endfor %}
 
 {%- for interface in interfaces %}
 {%-   for enum in interface.enums %}
 {{enum_stream_operator(enum)}}
 {{is_known_enum_value(enum)}}
@@ skipping 19 matching lines @@
 {#--- Union Serialization Helpers -#}
 {%  if unions %}
 {%-   for union in unions %}
 {%      include "union_serialization_declaration.tmpl" %}
 {%-   endfor %}
 {%- endif %}
 
 }  // namespace mojo
 
 #endif  // {{header_guard}}