diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2016-01-06 17:05:34 -0800 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2016-01-06 17:05:34 -0800 |
| commit | 54ed674d406e43a9c54ad103b5ea454d73a64c3b (patch) | |
| tree | 537260382904f46194fcc618a0f5d2c8e7c57b6f /test/cpp/end2end/generic_end2end_test.cc | |
| parent | c12f8a9d392393f34784a5a61364c68d7a3566ea (diff) | |
| parent | fc5281f66d9bd134d893e23bb45757677b1096c2 (diff) | |
Merge github.com:grpc/grpc into proto_names
Diffstat (limited to 'test/cpp/end2end/generic_end2end_test.cc')
| -rw-r--r-- | test/cpp/end2end/generic_end2end_test.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/cpp/end2end/generic_end2end_test.cc b/test/cpp/end2end/generic_end2end_test.cc index 104de99503..f8ceca5f1d 100644 --- a/test/cpp/end2end/generic_end2end_test.cc +++ b/test/cpp/end2end/generic_end2end_test.cc @@ -60,7 +60,7 @@ namespace grpc { namespace testing { namespace { -void* tag(int i) { return (void*)(gpr_intptr)i; } +void* tag(int i) { return (void*)(intptr_t)i; } void verify_ok(CompletionQueue* cq, int i, bool expect_ok) { bool ok; |