Correct Struct32 encoding: size/code/data.

Proper re-encoding for unknown struct codes.


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@648362 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 3 insertions, 3 deletions

diff --git a/qpid/cpp/rubygen/0-10/specification.rb b/qpid/cpp/rubygen/0-10/specification.rb
index 4f912228f7..77d59fd214 100755
--- a/qpid/cpp/rubygen/0-10/specification.rb
+++ b/qpid/cpp/rubygen/0-10/specification.rb
@@ -159,7 +159,7 @@ class Specification < CppGen
   end
 
   # Generate struct definitions into a separate header file so the
-  # can be included by Struct32.h without circularity.
+  # can be included by StructHolder.h without circularity.
   def gen_structs()
     h_file("#{@dir}/structs") { 
       include "#{@dir}/specification_fwd"
@@ -177,7 +177,7 @@ class Specification < CppGen
     
     cpp_file("#{@dir}/structs") { 
       include "#{@dir}/structs"
-      include "#{@dir}/Struct32"
+      include "#{@dir}/StructHolder"
       namespace(@ns) {
         each_class_ns { |c|
           c.collect_all(AmqpStruct).each {  |s| struct_cpp(s) }
@@ -283,7 +283,7 @@ class Specification < CppGen
   end
 
   def gen_holder(base, subs)
-    name= (base=="Struct") ? "Struct32" : base+"Holder"
+    name=base+"Holder"
     h_file("#{@dir}/#{name}") {
       include "#{@dir}/Apply#{base}"
       include "#{@dir}/Holder"