diff options
author | 2016-06-07 11:00:42 -0700 | |
---|---|---|
committer | 2016-06-07 11:00:42 -0700 | |
commit | 2888bd58b00b30429470652b05bc2076785e8a99 (patch) | |
tree | 3504519324f38da2279f3190534cbf9c19e6ca3a /test/cpp/qps | |
parent | d0e4deb8ef30b6364c2f642c4ac7b259a2665780 (diff) | |
parent | 570408fd4c508e2726fdff3e1c2541465ebc74a7 (diff) |
Merge github.com:grpc/grpc into error
Diffstat (limited to 'test/cpp/qps')
-rw-r--r-- | test/cpp/qps/parse_json.cc | 2 | ||||
-rw-r--r-- | test/cpp/qps/parse_json.h | 2 | ||||
-rw-r--r-- | test/cpp/qps/qps_json_driver.cc | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/test/cpp/qps/parse_json.cc b/test/cpp/qps/parse_json.cc index df7a62f0a0..a90bf6153c 100644 --- a/test/cpp/qps/parse_json.cc +++ b/test/cpp/qps/parse_json.cc @@ -31,8 +31,6 @@ * */ -#include <grpc++/support/config_protobuf.h> - #include "test/cpp/qps/parse_json.h" #include <string> diff --git a/test/cpp/qps/parse_json.h b/test/cpp/qps/parse_json.h index 4b8ca79f21..42d7d22c53 100644 --- a/test/cpp/qps/parse_json.h +++ b/test/cpp/qps/parse_json.h @@ -34,8 +34,8 @@ #ifndef TEST_QPS_PARSE_JSON_H #define TEST_QPS_PARSE_JSON_H +#include <grpc++/impl/codegen/config_protobuf.h> #include <grpc++/support/config.h> -#include <grpc++/support/config_protobuf.h> namespace grpc { namespace testing { 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> |