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

Unified Diff: mojo/public/tools/bindings/generators/cpp_templates/wrapper_union_class_definition.tmpl

Issue 2031823002: Mojo C++ bindings: more consistent Clone() and Equals(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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: mojo/public/tools/bindings/generators/cpp_templates/wrapper_union_class_definition.tmpl
diff --git a/mojo/public/tools/bindings/generators/cpp_templates/wrapper_union_class_definition.tmpl b/mojo/public/tools/bindings/generators/cpp_templates/wrapper_union_class_definition.tmpl
index 8d2b9e5e654ea2690d40a65173f03a703d3afbf8..b0679b1476db3d51a7e4dd369fda58582c088994 100644
--- a/mojo/public/tools/bindings/generators/cpp_templates/wrapper_union_class_definition.tmpl
+++ b/mojo/public/tools/bindings/generators/cpp_templates/wrapper_union_class_definition.tmpl
@@ -15,46 +15,6 @@
DestroyActive();
}
-{% if union|is_cloneable_kind %}
-{{union.name}}Ptr {{union.name}}::Clone() const {
- {{union.name}}Ptr rv(New());
- switch (tag_) {
-{% for field in union.fields %}
- case Tag::{{field.name|upper}}:
-{% if field.kind|is_string_kind %}
- rv->set_{{field.name}}(*(data_.{{field.name}}));
-{% elif field.kind|is_object_kind %}
- rv->set_{{field.name}}(data_.{{field.name}}->Clone());
-{%- else %}
- rv->set_{{field.name}}(data_.{{field.name}});
-{%- endif %}
- break;
-{%- endfor %}
- };
- return rv;
-}
-{%- endif %}
-
-bool {{union.name}}::Equals(const {{union.name}}& other) const {
- if (tag_ != other.which()) {
- return false;
- }
-
- switch (tag_) {
-{% for field in union.fields %}
- case Tag::{{field.name|upper}}:
-{% if field.kind|is_object_kind or field.kind|is_any_handle_kind or
- field.kind|is_interface_kind or field.kind|is_associated_kind %}
- return mojo::internal::ValueTraits<{{field.kind|cpp_wrapper_type}}>::Equals(*(data_.{{field.name}}), *(other.data_.{{field.name}}));
-{%- else %}
- return mojo::internal::ValueTraits<{{field.kind|cpp_wrapper_type}}>::Equals(data_.{{field.name}}, other.data_.{{field.name}});
-{%- endif %}
-{%- endfor %}
- };
-
- return false;
-}
-
{% for field in union.fields %}
bool {{union.name}}::is_{{field.name}}() const {
return tag_ == Tag::{{field.name|upper}};

Powered by Google App Engine
This is Rietveld 408576698