diff options
| author |  Mathieu Leenhardt <mleenhardt@users.noreply.github.com> | 2016-04-06 23:04:16 +0200 |
|---|---|---|
| committer | Mathieu Leenhardt <mleenhardt@users.noreply.github.com> | 2016-04-06 23:04:16 +0200 |
| commit | efa6af7381a78c67785f1717fa6497e1577f6638 (patch) | |
| tree | 3e8e8ad72a994a72d422d971f2b93489174b6955 /test/cpp/interop/interop_client.h | |
| parent | 9ef407b0d771878ca1c0f35b4554dd64a3492908 (diff) | |
| parent | 39a96967f1b003391b02317bf7c6fb003edc4722 (diff) | |
Merge branch 'master' into calloptions-fluent
Diffstat (limited to 'test/cpp/interop/interop_client.h')
| -rw-r--r-- | test/cpp/interop/interop_client.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/cpp/interop/interop_client.h b/test/cpp/interop/interop_client.h index 3ecd380398..a3794fd93f 100644 --- a/test/cpp/interop/interop_client.h +++ b/test/cpp/interop/interop_client.h @@ -36,8 +36,8 @@ #include <memory> -#include <grpc/grpc.h> #include <grpc++/channel.h> +#include <grpc/grpc.h> #include "src/proto/grpc/testing/messages.grpc.pb.h" #include "src/proto/grpc/testing/test.grpc.pb.h" @@ -75,6 +75,7 @@ class InteropClient { void DoTimeoutOnSleepingServer(); void DoEmptyStream(); void DoStatusWithMessage(); + void DoCustomMetadata(); // Auth tests. // username is a string containing the user email void DoJwtTokenCreds(const grpc::string& username); |