Merge branch 'master' into jwi-idl4optional

RemedyIT · Dec 1, 2023 · 055f81b · 055f81b
2 parents 3883ea4 + 932f81f
commit 055f81b
Show file tree

Hide file tree

Showing 12 changed files with 319 additions and 282 deletions.
diff --git a/brix/taox11/require.rb b/brix/taox11/require.rb
@@ -13,7 +13,7 @@ module TAOX11
     TITLE = 'TAOX11'.freeze
     DESC = 'BRIX11 TAOX11 brix collection'.freeze
     COPYRIGHT = "Copyright (c) 2014-#{Time.now.year} Remedy IT Expertise BV, The Netherlands".freeze
-    VERSION = { major: 2, minor: 5, release: 0 }
+    VERSION = { major: 2, minor: 6, release: 0 }
 
     Collection.configure(:taox11, ROOT, TITLE, DESC, COPYRIGHT, VERSION) do |cfg|
       cfg.on_setup do |optparser, options|

diff --git a/ridlbe/c++11/templates/cli/hdr/typedef_anyop.erb b/ridlbe/c++11/templates/cli/hdr/typedef_anyop.erb
@@ -8,17 +8,11 @@
 
 #define _ALIAS_ANYOP_<%= scoped_cxxname.scope_to_cxxname %>_IMPL_
 <%= anytypecode_export_macro %> void
-_any_cp_in_<%= scoped_cxxname.scope_to_cxxname %> (
-    TAOX11_CORBA::Any&,
-    <%= scoped_cxx_in_type %>);
+_any_cp_in_<%= scoped_cxxname.scope_to_cxxname %> (TAOX11_CORBA::Any&, <%= scoped_cxx_in_type %>);
 <%= anytypecode_export_macro %> void
-_any_mv_in_<%= scoped_cxxname.scope_to_cxxname %> (
-    TAOX11_CORBA::Any&,
-    <%= scoped_cxx_move_type %>);
+_any_mv_in_<%= scoped_cxxname.scope_to_cxxname %> (TAOX11_CORBA::Any&, <%= scoped_cxx_move_type %>);
 <%= anytypecode_export_macro %> bool
-_any_out_<%= scoped_cxxname.scope_to_cxxname %> (
-    const TAOX11_CORBA::Any&,
-    <%= scoped_cxx_out_type %>);
+_any_out_<%= scoped_cxxname.scope_to_cxxname %> (const TAOX11_CORBA::Any&, <%= scoped_cxx_out_type %>);
 
 /// Copying any insertion operator
 inline void operator<<= (TAOX11_CORBA::Any& any, <%= scoped_cxx_in_type %> _val)