aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Michael Lumish <mlumish@google.com>2015-07-27 08:55:21 -0700
committerGravatar Michael Lumish <mlumish@google.com>2015-07-27 08:55:21 -0700
commitd116a2d3a9cb8d44c6190f875835f6c87001f3ce (patch)
treee2d4b263da9fdaacf447b233f27d0bef0905cdb8
parent5c575dd6e4b01cd68cca5d1917b58023dcf4ca0f (diff)
parenta5fea60e8d8c7bdf0cc82ac04a5c086b900d7531 (diff)
Merge pull request #2632 from marcinwyszynski/master
Avoid implicit conversions in Ruby extension code
-rw-r--r--src/ruby/ext/grpc/rb_call.c4
-rw-r--r--src/ruby/ext/grpc/rb_grpc.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/ruby/ext/grpc/rb_call.c b/src/ruby/ext/grpc/rb_call.c
index bfb9f6ff01..a7607a83a3 100644
--- a/src/ruby/ext/grpc/rb_call.c
+++ b/src/ruby/ext/grpc/rb_call.c
@@ -235,8 +235,8 @@ static VALUE grpc_rb_call_set_metadata(VALUE self, VALUE metadata) {
*/
static int grpc_rb_md_ary_fill_hash_cb(VALUE key, VALUE val, VALUE md_ary_obj) {
grpc_metadata_array *md_ary = NULL;
- int array_length;
- int i;
+ long array_length;
+ long i;
/* Construct a metadata object from key and value and add it */
TypedData_Get_Struct(md_ary_obj, grpc_metadata_array,
diff --git a/src/ruby/ext/grpc/rb_grpc.c b/src/ruby/ext/grpc/rb_grpc.c
index 65d9c9a237..327fd1a4fc 100644
--- a/src/ruby/ext/grpc/rb_grpc.c
+++ b/src/ruby/ext/grpc/rb_grpc.c
@@ -139,7 +139,7 @@ gpr_timespec grpc_rb_time_timeval(VALUE time, int interval) {
rb_raise(rb_eRangeError, "%f out of Time range",
RFLOAT_VALUE(time));
}
- t.tv_nsec = (time_t)(d * 1e9 + 0.5);
+ t.tv_nsec = (int)(d * 1e9 + 0.5);
}
break;