Merge "Add monostate to optional safe unions."

diff --git a/neuralnetworks/1.2/types.hal b/neuralnetworks/1.2/types.hal
index 43771316d8a877e739435701fd69584d4458baa9..bed1d5cad90b5da76ab0e4e8d4d7f2ae5f790e60 100644 (file)
--- a/neuralnetworks/1.2/types.hal
+++ b/neuralnetworks/1.2/types.hal
@@ -30,7 +30,7 @@ enum OperationType : @1.1::OperationType {
     ARGMAX = 38,
     ARGMIN = 39,
     PAD_V2 = 40,
-    BBOX_TRANSFORM = 41,
+    AXIS_ALIGNED_BBOX_TRANSFORM = 41,
     BIDIRECTIONAL_SEQUENCE_LSTM = 42,
     BIDIRECTIONAL_SEQUENCE_RNN = 43,
     BOX_WITH_NMS_LIMIT = 44,
@@ -76,6 +76,7 @@ enum OperationType : @1.1::OperationType {
     TRANSPOSE_CONV_2D = 84,
     UNIDIRECTIONAL_SEQUENCE_LSTM = 85,
     UNIDIRECTIONAL_SEQUENCE_RNN = 86,
+    ROTATED_BBOX_TRANSFORM = 87,
 };
 
 /**

diff --git a/tests/foo/1.0/IFoo.hal b/tests/foo/1.0/IFoo.hal
index f54994f5dd579ba648b767f7eb671830d36912e8..4c5442754c0e176244d99f9331bc50d534f89a7c 100644 (file)
--- a/tests/foo/1.0/IFoo.hal
+++ b/tests/foo/1.0/IFoo.hal
@@ -122,7 +122,14 @@ interface IFoo {
     };
 
     struct WithFmq {
-        fmq_sync<uint8_t> descSync;
+        struct ScatterGather {
+            fmq_sync<uint8_t> descSync;
+        } scatterGathered;
+
+        struct ContainsPointer {
+            fmq_sync<uint8_t> descSync;
+            interface foo;
+        } containsPointer;
     };
 
     enum Discriminator : uint8_t {