Fixed a bug where Ruby/C number conversions failed on 32-bit architectures.

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

2 files changed, 16 insertions, 16 deletions

diff --git a/qpid/cpp/bindings/qmf/ruby/qmf.rb b/qpid/cpp/bindings/qmf/ruby/qmf.rb
index ea6b16f636..7ee447c675 100644
--- a/qpid/cpp/bindings/qmf/ruby/qmf.rb
+++ b/qpid/cpp/bindings/qmf/ruby/qmf.rb
@@ -485,21 +485,21 @@ module Qmf
         end
       end
 
-      def set_attr(name, value)
+      def set_attr(name, v)
         val = value(name)
         case val.getType
-        when TYPE_UINT8, TYPE_UINT16, TYPE_UINT32 then val.setUint(value)
-        when TYPE_UINT64 then val.setUint64(value)
-        when TYPE_SSTR, TYPE_LSTR then value ? val.setString(value) : val.setString('')
-        when TYPE_ABSTIME then val.setInt64(value)
-        when TYPE_DELTATIME then val.setUint64(value)
-        when TYPE_REF then val.setObjectId(value.impl)
-        when TYPE_BOOL then value ? val.setBool(value) : val.setBool(0)
-        when TYPE_FLOAT then val.setFloat(value)
-        when TYPE_DOUBLE then val.setDouble(value)
-        when TYPE_UUID then val.setUuid(value)
-        when TYPE_INT8, TYPE_INT16, TYPE_INT32 then val.setInt(value)
-        when TYPE_INT64 then val.setInt64(value)
+        when TYPE_UINT8, TYPE_UINT16, TYPE_UINT32 then val.setUint(v)
+        when TYPE_UINT64 then val.setUint64(v)
+        when TYPE_SSTR, TYPE_LSTR then v ? val.setString(v) : val.setString('')
+        when TYPE_ABSTIME then val.setInt64(v)
+        when TYPE_DELTATIME then val.setUint64(v)
+        when TYPE_REF then val.setObjectId(v.impl)
+        when TYPE_BOOL then v ? val.setBool(v) : val.setBool(0)
+        when TYPE_FLOAT then val.setFloat(v)
+        when TYPE_DOUBLE then val.setDouble(v)
+        when TYPE_UUID then val.setUuid(v)
+        when TYPE_INT8, TYPE_INT16, TYPE_INT32 then val.setInt(v)
+        when TYPE_INT64 then val.setInt64(v)
         when TYPE_MAP
         when TYPE_OBJECT
         when TYPE_LIST
diff --git a/qpid/cpp/bindings/qmf/ruby/ruby.i b/qpid/cpp/bindings/qmf/ruby/ruby.i
index cf69e2863a..a8a2a87a97 100644
--- a/qpid/cpp/bindings/qmf/ruby/ruby.i
+++ b/qpid/cpp/bindings/qmf/ruby/ruby.i
@@ -33,7 +33,7 @@
 
 %typemap (in) uint16_t
 {
-    $1 = FIX2UINT ($input);
+    $1 = NUM2UINT ($input);
 }
 
 %typemap (out) uint16_t
@@ -43,7 +43,7 @@
 
 %typemap (in) uint32_t
 {
-    $1 = FIX2UINT ($input);
+    $1 = NUM2UINT ($input);
 }
 
 %typemap (out) uint32_t
@@ -57,7 +57,7 @@
 
 %typemap (in) uint64_t
 {
-    $1 = FIX2ULONG ($input);
+    $1 = NUM2ULONG ($input);
 }
 
 %typemap (out) uint64_t