diff options
| author |  kpayson64 <kpayson@google.com> | 2018-05-11 12:20:11 -0700 |
|---|---|---|
| committer | kpayson64 <kpayson@google.com> | 2018-05-11 12:20:11 -0700 |
| commit | 4fad281ce8affe27fb7428f264d2c3b9dfc45f2f (patch) | |
| tree | ca96c9efd69afec56aa2e5fe072a9f758247d0a3 /test/cpp/qps/driver.cc | |
| parent | ec445cc2bb270ed4acb1c710c3533fca14a50019 (diff) | |
| parent | 61fdb46ac456027c79841949272ec540f66d2317 (diff) | |
Merge remote-tracking branch 'upstream/master' into fork_exec_ctx_check
Diffstat (limited to 'test/cpp/qps/driver.cc')
| -rw-r--r-- | test/cpp/qps/driver.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/test/cpp/qps/driver.cc b/test/cpp/qps/driver.cc index 4e0d266d77..34f1291576 100644 --- a/test/cpp/qps/driver.cc +++ b/test/cpp/qps/driver.cc @@ -23,16 +23,17 @@ #include <unordered_map> #include <vector> -#include <grpc++/channel.h> -#include <grpc++/client_context.h> -#include <grpc++/create_channel.h> #include <grpc/support/alloc.h> #include <grpc/support/log.h> #include <grpc/support/string_util.h> +#include <grpcpp/channel.h> +#include <grpcpp/client_context.h> +#include <grpcpp/create_channel.h> #include "src/core/lib/gpr/env.h" #include "src/core/lib/gpr/host_port.h" #include "src/core/lib/profiling/timers.h" +#include "src/proto/grpc/testing/worker_service.grpc.pb.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" #include "test/cpp/qps/client.h" |