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

Unified Diff: mojo/public/cpp/bindings/lib/array_internal.h

Issue 923033003: Implement unions as members of structs. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 9 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
« no previous file with comments | « no previous file | mojo/public/cpp/bindings/lib/array_serialization.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/public/cpp/bindings/lib/array_internal.h
diff --git a/mojo/public/cpp/bindings/lib/array_internal.h b/mojo/public/cpp/bindings/lib/array_internal.h
index eb25e35210a5d49cc5d41ff2caab9664db479630..f56319bbd280195177f9bad7e4f3c54d5c6e5d4f 100644
--- a/mojo/public/cpp/bindings/lib/array_internal.h
+++ b/mojo/public/cpp/bindings/lib/array_internal.h
@@ -285,8 +285,13 @@ struct ArraySerializationHelper<P*, false> {
}
private:
+ template <typename T,
+ typename Params,
+ bool is_union = IsUnionDataType<T>::value>
+ struct ValidateCaller {};
+
template <typename T, typename Params>
- struct ValidateCaller {
+ struct ValidateCaller<T, Params, false> {
static bool Run(const void* data, BoundsChecker* bounds_checker) {
static_assert((IsSame<Params, NoValidateParams>::value),
"Struct type should not have array validate params");
@@ -295,8 +300,18 @@ struct ArraySerializationHelper<P*, false> {
}
};
+ template <typename T, typename Params>
+ struct ValidateCaller<T, Params, true> {
+ static bool Run(const void* data, BoundsChecker* bounds_checker) {
+ static_assert((IsSame<Params, NoValidateParams>::value),
+ "Union type should not have array validate params");
+
+ return T::Validate(data, bounds_checker, true);
+ }
+ };
+
template <typename Key, typename Value, typename Params>
- struct ValidateCaller<Map_Data<Key, Value>, Params> {
+ struct ValidateCaller<Map_Data<Key, Value>, Params, false> {
static bool Run(const void* data, BoundsChecker* bounds_checker) {
return Map_Data<Key, Value>::template Validate<Params>(data,
bounds_checker);
@@ -304,7 +319,7 @@ struct ArraySerializationHelper<P*, false> {
};
template <typename T, typename Params>
- struct ValidateCaller<Array_Data<T>, Params> {
+ struct ValidateCaller<Array_Data<T>, Params, false> {
static bool Run(const void* data, BoundsChecker* bounds_checker) {
return Array_Data<T>::template Validate<Params>(data, bounds_checker);
}
« no previous file with comments | « no previous file | mojo/public/cpp/bindings/lib/array_serialization.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698