From 4d6bb608337f0aa6a4f8d96ae0df5fffd981f113 Mon Sep 17 00:00:00 2001
From: Alan Conway <aconway@apache.org>
Date: Mon, 27 Aug 2007 13:31:41 +0000
Subject: 	* rubygen/cppgen.rb: Use uint rather than u_int form for
 consistency. 	* rubygen/amqpgen.rb: Removed unnecessary sorting.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@570111 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/cpp/rubygen/amqpgen.rb           |  6 ------
 qpid/cpp/rubygen/cppgen.rb            | 15 ++++++++-------
 qpid/cpp/rubygen/templates/structs.rb |  2 +-
 3 files changed, 9 insertions(+), 14 deletions(-)

(limited to 'qpid/cpp')

diff --git a/qpid/cpp/rubygen/amqpgen.rb b/qpid/cpp/rubygen/amqpgen.rb
index 068ecf7aae..6707b0c5a0 100755
--- a/qpid/cpp/rubygen/amqpgen.rb
+++ b/qpid/cpp/rubygen/amqpgen.rb
@@ -170,9 +170,6 @@ class AmqpClass < AmqpElement
 
   amqp_child_reader :method
 
-  # FIXME aconway 2007-08-27: REMOVE
-  def methods_() children("method").sort_by_name;  end
-
   # chassis should be "client" or "server"
   def methods_on(chassis)
     @methods_on ||= { }
@@ -197,9 +194,6 @@ class AmqpRoot < AmqpElement
   amqp_attr_reader :major, :minor
   amqp_child_reader :class, :domain
 
-  # FIXME aconway 2007-08-27: REMOVE
-  def classes() children("class").sort_by_name; end
-  
   def version() major + "-" + minor; end
 
   def domain_structs() domains.map{ |d| d.struct }.compact; end
diff --git a/qpid/cpp/rubygen/cppgen.rb b/qpid/cpp/rubygen/cppgen.rb
index 99d80b0b4e..d72731075f 100755
--- a/qpid/cpp/rubygen/cppgen.rb
+++ b/qpid/cpp/rubygen/cppgen.rb
@@ -108,19 +108,20 @@ end
 class AmqpDomain
   @@typemap = {
     "bit"=> CppType.new("bool").code("Octet"),
-    "octet"=>CppType.new("u_int8_t").code("Octet"), # FIXME aconway 2007-08-25: uint
-    "short"=>CppType.new("u_int16_t").code("Short"),
-    "long"=>CppType.new("u_int32_t").code("Long"),
-    "longlong"=>CppType.new("u_int64_t").code("LongLong"),
-    "timestamp"=>CppType.new("u_int64_t").code("LongLong"),
+    "octet"=>CppType.new("uint8_t").code("Octet"), 
+    "short"=>CppType.new("uint16_t").code("Short"),
+    "long"=>CppType.new("uint32_t").code("Long"),
+    "longlong"=>CppType.new("uint64_t").code("LongLong"),
+    "timestamp"=>CppType.new("uint64_t").code("LongLong"),
     "longstr"=>CppType.new("string").passcref.retcref.code("LongString"),
     "shortstr"=>CppType.new("string").passcref.retcref.code("ShortString"),
     "table"=>CppType.new("FieldTable").passcref.retcref.code("FieldTable"),
     "content"=>CppType.new("Content").passcref.retcref.code("Content"),
     "rfc1982-long-set"=>CppType.new("SequenceNumberSet").passcref.retcref,
     "long-struct"=>CppType.new("string").passcref.retcref.code("LongString"),
-    "uuid"=>CppType.new("string").passcref.retcref.code("ShortString") # FIXME aconway 2007-08-25: Remove, 
-#    "uuid"=>CppType.new("Uuid").passcref.retcref.code,
+    # FIXME aconway 2007-08-25: Use Uuid class.
+    # "uuid"=>CppType.new("Uuid").passcref.retcref.code,
+    "uuid"=>CppType.new("string").passcref.retcref.code("ShortString") 
   }
 
   def cppname() name.caps; end
diff --git a/qpid/cpp/rubygen/templates/structs.rb b/qpid/cpp/rubygen/templates/structs.rb
index 47670e9953..c92f71c777 100644
--- a/qpid/cpp/rubygen/templates/structs.rb
+++ b/qpid/cpp/rubygen/templates/structs.rb
@@ -21,7 +21,7 @@ class StructGen < CppGen
     "table"=>"FieldTable",
     "content"=>"Content",
     "long-struct"=>"LongString",
-    "uuid" => "ShortString"        # FIXME aconway 2007-08-27:
+    "uuid" => "ShortString"        # FIXME aconway 2007-08-27: Remove.
   }
   SizeMap={
     "octet"=>"1",
-- 
cgit v1.2.1