diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-09-12 17:29:39 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-09-12 17:29:39 -0700 |
| commit | 261666696496174f824d9e43a60559040eda3055 (patch) | |
| tree | 96d8d7c115369ed33f6d67baf1ac4bb1c865e434 | |
| parent | 0a232d8379f0990e1a90c5a10db5f46a00db1106 (diff) | |
| parent | f6a39e96fbcc7728e4b5b356fab523c9b5aa6c44 (diff) | |
Merge pull request #3337 from dgquintas/sign_macosx
Fixes for -Wsign-conversion compilation errors (mac & C#)
| -rw-r--r-- | src/core/support/log_posix.c | 2 | ||||
| -rw-r--r-- | src/csharp/ext/grpc_csharp_ext.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/core/support/log_posix.c b/src/core/support/log_posix.c index 021c4666d4..8b050dbee7 100644 --- a/src/core/support/log_posix.c +++ b/src/core/support/log_posix.c @@ -64,7 +64,7 @@ void gpr_log(const char *file, int line, gpr_log_severity severity, } else { message = allocated = gpr_malloc((size_t)ret + 1); va_start(args, format); - vsnprintf(message, ret + 1, format, args); + vsnprintf(message, (size_t)(ret + 1), format, args); va_end(args); } gpr_log_message(file, line, severity, message); diff --git a/src/csharp/ext/grpc_csharp_ext.c b/src/csharp/ext/grpc_csharp_ext.c index 70c0fbcc50..51e0728fb9 100644 --- a/src/csharp/ext/grpc_csharp_ext.c +++ b/src/csharp/ext/grpc_csharp_ext.c @@ -252,7 +252,7 @@ GPR_EXPORT gpr_intptr GPR_CALLTYPE grpcsharp_batch_context_recv_message_length( if (!ctx->recv_message) { return -1; } - return grpc_byte_buffer_length(ctx->recv_message); + return (gpr_intptr)grpc_byte_buffer_length(ctx->recv_message); } /* |