You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2007/08/27 15:31:42 UTC
svn commit: r570111 - in /incubator/qpid/trunk/qpid/cpp/rubygen: amqpgen.rb
cppgen.rb templates/structs.rb
Author: aconway
Date: Mon Aug 27 06:31:41 2007
New Revision: 570111
URL: http://svn.apache.org/viewvc?rev=570111&view=rev
Log:
* rubygen/cppgen.rb: Use uint rather than u_int form for consistency.
* rubygen/amqpgen.rb: Removed unnecessary sorting.
Modified:
incubator/qpid/trunk/qpid/cpp/rubygen/amqpgen.rb
incubator/qpid/trunk/qpid/cpp/rubygen/cppgen.rb
incubator/qpid/trunk/qpid/cpp/rubygen/templates/structs.rb
Modified: incubator/qpid/trunk/qpid/cpp/rubygen/amqpgen.rb
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/rubygen/amqpgen.rb?rev=570111&r1=570110&r2=570111&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/rubygen/amqpgen.rb (original)
+++ incubator/qpid/trunk/qpid/cpp/rubygen/amqpgen.rb Mon Aug 27 06:31:41 2007
@@ -170,9 +170,6 @@
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 @@
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
Modified: incubator/qpid/trunk/qpid/cpp/rubygen/cppgen.rb
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/rubygen/cppgen.rb?rev=570111&r1=570110&r2=570111&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/rubygen/cppgen.rb (original)
+++ incubator/qpid/trunk/qpid/cpp/rubygen/cppgen.rb Mon Aug 27 06:31:41 2007
@@ -108,19 +108,20 @@
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
Modified: incubator/qpid/trunk/qpid/cpp/rubygen/templates/structs.rb
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/rubygen/templates/structs.rb?rev=570111&r1=570110&r2=570111&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/rubygen/templates/structs.rb (original)
+++ incubator/qpid/trunk/qpid/cpp/rubygen/templates/structs.rb Mon Aug 27 06:31:41 2007
@@ -21,7 +21,7 @@
"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",