diff options
| author |  Jan Tattermusch <jtattermusch@google.com> | 2015-08-26 08:50:19 -0700 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@google.com> | 2015-08-26 08:50:19 -0700 |
| commit | 0608a00b505fe43a52614ec8703bb589332af064 (patch) | |
| tree | 72937fe6fb2423e52134af3ce2a4beea73da69d3 /test/core/end2end/cq_verifier.h | |
| parent | d8fc8606740416b1cbe4d2f3754705b108fd2c5c (diff) | |
| parent | afbbaf9c3e21b6a4fe41242df9d052e077dc25c0 (diff) | |
Merge remote-tracking branch 'upstream/master' into csharp_upgrade_to_proto3
Conflicts:
src/csharp/Grpc.IntegrationTesting/InteropClient.cs
Diffstat (limited to 'test/core/end2end/cq_verifier.h')
| -rw-r--r-- | test/core/end2end/cq_verifier.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/test/core/end2end/cq_verifier.h b/test/core/end2end/cq_verifier.h index 1ecd4db5da..b3e07c45a5 100644 --- a/test/core/end2end/cq_verifier.h +++ b/test/core/end2end/cq_verifier.h @@ -60,6 +60,7 @@ void cq_verify_empty(cq_verifier *v); void cq_expect_completion(cq_verifier *v, void *tag, int success); int byte_buffer_eq_string(grpc_byte_buffer *byte_buffer, const char *string); -int contains_metadata(grpc_metadata_array *array, const char *key, const char *value); +int contains_metadata(grpc_metadata_array *array, const char *key, + const char *value); -#endif /* GRPC_TEST_CORE_END2END_CQ_VERIFIER_H */ +#endif /* GRPC_TEST_CORE_END2END_CQ_VERIFIER_H */ |