diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-01-29 21:01:47 -0800 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-01-29 21:01:47 -0800 |
| commit | 44c02738ed5352dfa908bd3e96f99f2348ccc2d5 (patch) | |
| tree | cce7e7ecfeca428206a6449c0641a3506b302f77 /test/core/surface | |
| parent | a0935d9e3661b073f5f630b1b2333ed63d55a1cb (diff) | |
| parent | b24b50094c2eb6d617847ff957afcc58ac5c569c (diff) | |
Merge github.com:google/grpc into async-api
Conflicts:
test/core/echo/echo_test.c
Diffstat (limited to 'test/core/surface')
| -rw-r--r-- | test/core/surface/completion_queue_test.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/core/surface/completion_queue_test.c b/test/core/surface/completion_queue_test.c index 2928623f6d..875cf3e52a 100644 --- a/test/core/surface/completion_queue_test.c +++ b/test/core/surface/completion_queue_test.c @@ -188,7 +188,7 @@ static void test_pluck(void) { grpc_event *ev; grpc_completion_queue *cc; void *tags[128]; - int i, j; + unsigned i, j; int on_finish_called = 0; LOG_TEST(); |