Layout changes

    * ridlbe/c++11/templates/cli/hdr/bitset.erb:
    * ridlbe/c++11/templates/cli/inl/bitset_inl.erb:

ridlbe/c++11/templates/cli/hdr/bitset.erb

@@ -14,7 +14,7 @@ public:
 %unless base.nil?
   using <%= base.cxxname %>::<%= base.cxxname %>;
 %end
-%_ms = bitfields.dup
+%_ms = bitfields.dup.find_all {|bitf| !bitf.cxxname.empty? }
   /// Constructor which accepts value for all members
   explicit inline <%= cxxname %> (
 %unless base.nil?
@@ -27,11 +27,9 @@ public:
 %  end
 %end
 
-%bitfields.each do |_m|
-% unless _m.cxxname.empty?
+%bitfields.find_all {|bitf| !bitf.cxxname.empty? }.each do |_m|
   inline void <%= _m.cxxname %> (<%= _m.cxx_in_type %> _x11_<%= _m.cxxname %>) { this->_taox11_<%= cxxname.downcase %>.<%= _m.cxxname %> = _x11_<%= _m.cxxname %>; }
   inline <%= _m.cxx_in_type %> <%= _m.cxxname %> () const { return this->_taox11_<%= cxxname.downcase %>.<%= _m.cxxname %>; }
-% end
 %end
 
   /// Exchange the value of two bitsets in an efficient matter
@@ -47,4 +45,6 @@ private:
   } _taox11_<%= cxxname.downcase %>;
 }; // <%= cxxname %>
 
+inline void swap (<%= scoped_cxx_out_type %> m1, <%= scoped_cxx_out_type %> m2) { m1.swap (m2); }
+
 % visit_template('typecode') if generate_typecode_support?

ridlbe/c++11/templates/cli/inl/bitset_inl.erb

@@ -4,30 +4,27 @@
 %#  Constructor inlines
 %#
 %#  Initializer CTOR
-%   _ms = bitfields.dup
+%_ms = bitfields.dup.find_all {|bitf| !bitf.cxxname.empty? }
 inline <%= scoped_cxxtype %>::<%= cxxname %> (
-%   unless base.nil?
+%  unless base.nil?
   <%= base.cxxname %> _base<%= _ms.empty? ? ')' : ',' %>
-%   end
-%   unless _ms.empty?
-%     while !_ms.empty?
-%       _m = _ms.shift
+%  end
+%  unless _ms.empty?
+%    while !_ms.empty?
+%      _m = _ms.shift
   <%= "#{_m.cxx_byval_type} #{_m.cxxname}" %><%= _ms.empty? ? ')' : ',' %>
-%     end
-%   end
-%   _pfx = nil
-%   unless base.nil?
+%    end
+%  end
+%  _pfx = nil
+%  unless base.nil?
   : <%= base.cxxname %> (std::move(_base))<% unless _ms.empty? %>,<% end %>
-%   end
-  <% if base.nil? %>:<% else %>,<% end %> _taox11_<%= cxxname.downcase %> {
-%# Change formatting
-%   bitfields.each do |_m|
-% unless _m.cxxname.empty?
- <%= _pfx %><%= _m.cxxname %>
+%  end
+% str = ""
+% bitfields.find_all {|bitf| !bitf.cxxname.empty? }.each do |_m|
+%   str = "#{str}#{_pfx}#{_m.cxxname}"
+%   _pfx = ', ' unless _pfx
 % end
-%     _pfx = ', ' unless _pfx
-%   end
-}
+  <% if base.nil? %>:<% else %>,<% end %> _taox11_<%= cxxname.downcase %> { <%= str %> }
 {
 }