Merge pull request #406 from jwillemsen/jwi-bitsettest2

Bitset changes
RemedyIT · Oct 23, 2024 · 4ce6321 · 4ce6321
2 parents d44f00b + 5e401e1
commit 4ce6321
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/ridlbe/c++11/writers/servantsource.rb b/ridlbe/c++11/writers/servantsource.rb
@@ -333,7 +333,7 @@ def check_idl_type(idl_type)
         when IDL::Type::Enum
           visitor(EnumVisitor).visit_sarg_traits(res_idl_type.node) unless is_tracked?(res_idl_type.node)
         when IDL::Type::BitSet
-          visitor(BitsetVisitor).visit_sarg_traits(res_idl_type.node)# unless is_tracked?(res_idl_type.node)
+          visitor(BitsetVisitor).visit_sarg_traits(res_idl_type.node) unless is_tracked?(res_idl_type.node)
         when IDL::Type::BitMask
           visitor(BitmaskVisitor).visit_sarg_traits(res_idl_type.node) unless is_tracked?(res_idl_type.node)
         when IDL::Type::Union

diff --git a/tests/idl4/bitset/client.cpp b/tests/idl4/bitset/client.cpp
@@ -12,7 +12,7 @@
 
 int main (int /*argc*/, char* /*argv*/[])
 {
-  MyBitset mbs1;
+  MyBitset1 mbs1;
 
   // Just compilation test
   TAOX11_TEST_INFO << "mbs1: " << mbs1 << std::endl;

diff --git a/tests/idl4/bitset/test.idl b/tests/idl4/bitset/test.idl
@@ -5,14 +5,14 @@
  * @copyright Copyright (c) Remedy IT Expertise BV
  */
 
-bitset MyBitset {
+bitset MyBitset1 {
   bitfield<1> x;
   bitfield<3> a;
   bitfield<12, short> d;
   bitfield<33> tt;
 };
 
-bitset MyBitset2 : MyBitset {
+bitset MyBitset2 : MyBitset1 {
   bitfield<3> c;
   bitfield<2>;
 };
@@ -22,9 +22,23 @@ bitset MyBitset3 : MyBitset2 {
   bitfield<4, int8>;
 };
 
-bitset MyBitset5
+bitset MyBitset4
 {
   bitfield<3> g;
   bitfield<10> h;
   bitfield<12, long> i;
 };
+
+module Test
+{
+  interface Foo
+  {
+    MyBitset1 test_mybitset1 (in MyBitset1 sin, inout MyBitset1 sinout, out MyBitset1 sout);
+    MyBitset2 test_mybitset2 (in MyBitset2 sin, inout MyBitset2 sinout, out MyBitset2 sout);
+    MyBitset3 test_mybitset3 (in MyBitset3 sin, inout MyBitset3 sinout, out MyBitset3 sout);
+    MyBitset4 test_mybitset4 (in MyBitset4 sin, inout MyBitset4 sinout, out MyBitset4 sout);
+
+    /// A method to shutdown the ORB
+    oneway void shutdown ();
+  };
+};