diff options
author | David Garcia Quintas <dgq@google.com> | 2016-06-07 18:51:36 -0700 |
---|---|---|
committer | David Garcia Quintas <dgq@google.com> | 2016-06-07 18:51:36 -0700 |
commit | dd385b6a19832992f130e55f33a02514b0bb4058 (patch) | |
tree | 1dc748e7107f73e18b17f6b047307ff615e00d87 /test/cpp/qps/qps_json_driver.cc | |
parent | a20a2ad41bfb1c30b0442578fa9fa1754bc60d53 (diff) | |
parent | d30d4e279c4a63effaa6e912fc00bd4ad96054c7 (diff) |
Merge branch 'master' of github.com:grpc/grpc into core_codegen_be_public
Diffstat (limited to 'test/cpp/qps/qps_json_driver.cc')
-rw-r--r-- | test/cpp/qps/qps_json_driver.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/cpp/qps/qps_json_driver.cc b/test/cpp/qps/qps_json_driver.cc index d7642f0e1e..f5d739f893 100644 --- a/test/cpp/qps/qps_json_driver.cc +++ b/test/cpp/qps/qps_json_driver.cc @@ -34,7 +34,7 @@ #include <memory> #include <set> -#include <grpc++/support/config_protobuf.h> +#include <grpc++/impl/codegen/config_protobuf.h> #include <gflags/gflags.h> #include <grpc/support/log.h> |