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/util/cli_call_test.cc | |
| parent | 9ef407b0d771878ca1c0f35b4554dd64a3492908 (diff) | |
| parent | 39a96967f1b003391b02317bf7c6fb003edc4722 (diff) | |
Merge branch 'master' into calloptions-fluent
Diffstat (limited to 'test/cpp/util/cli_call_test.cc')
| -rw-r--r-- | test/cpp/util/cli_call_test.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/cpp/util/cli_call_test.cc b/test/cpp/util/cli_call_test.cc index 5fdf519320..75e90f824f 100644 --- a/test/cpp/util/cli_call_test.cc +++ b/test/cpp/util/cli_call_test.cc @@ -1,6 +1,6 @@ /* * - * Copyright 2015-2016, Google Inc. + * Copyright 2015, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -33,18 +33,18 @@ #include "test/cpp/util/cli_call.h" -#include <grpc/grpc.h> #include <grpc++/channel.h> #include <grpc++/client_context.h> #include <grpc++/create_channel.h> #include <grpc++/server.h> #include <grpc++/server_builder.h> #include <grpc++/server_context.h> +#include <grpc/grpc.h> #include <gtest/gtest.h> +#include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" -#include "src/proto/grpc/testing/echo.grpc.pb.h" #include "test/cpp/util/string_ref_helper.h" using grpc::testing::EchoRequest; |