diff options
| author |  Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2016-06-07 10:53:03 -0700 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2016-06-07 10:53:03 -0700 |
| commit | 3c267368fdbbbb216542e4dab6ad900b88a593b9 (patch) | |
| tree | 5b0927efaa4a5e3a9500dec834ff19f6a3c90c71 /test/cpp | |
| parent | be59629736591a3d075f72d52fbd7092aa9ec9a2 (diff) | |
| parent | 34b5861e5cddda7461a2991b861b9d9788dfa96a (diff) | |
Merge pull request #6792 from yang-g/build_clean
Make grpc++ independent of protobuf
Diffstat (limited to 'test/cpp')
| -rw-r--r-- | test/cpp/end2end/generic_end2end_test.cc | 2 | ||||
| -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 | ||||
| -rw-r--r-- | test/cpp/util/byte_buffer_proto_helper.h | 2 | ||||
| -rw-r--r-- | test/cpp/util/proto_file_parser.cc | 1 |
6 files changed, 5 insertions, 6 deletions
diff --git a/test/cpp/end2end/generic_end2end_test.cc b/test/cpp/end2end/generic_end2end_test.cc index d0cf6aea9d..57efa5fa17 100644 --- a/test/cpp/end2end/generic_end2end_test.cc +++ b/test/cpp/end2end/generic_end2end_test.cc @@ -38,7 +38,7 @@ #include <grpc++/create_channel.h> #include <grpc++/generic/async_generic_service.h> #include <grpc++/generic/generic_stub.h> -#include <grpc++/impl/proto_utils.h> +#include <grpc++/impl/codegen/proto_utils.h> #include <grpc++/server.h> #include <grpc++/server_builder.h> #include <grpc++/server_context.h> 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> diff --git a/test/cpp/util/byte_buffer_proto_helper.h b/test/cpp/util/byte_buffer_proto_helper.h index 42cea59e33..007723c691 100644 --- a/test/cpp/util/byte_buffer_proto_helper.h +++ b/test/cpp/util/byte_buffer_proto_helper.h @@ -36,8 +36,8 @@ #include <memory> +#include <grpc++/impl/codegen/config_protobuf.h> #include <grpc++/support/byte_buffer.h> -#include <grpc++/support/config_protobuf.h> namespace grpc { namespace testing { diff --git a/test/cpp/util/proto_file_parser.cc b/test/cpp/util/proto_file_parser.cc index 6557b95f58..25aec329eb 100644 --- a/test/cpp/util/proto_file_parser.cc +++ b/test/cpp/util/proto_file_parser.cc @@ -38,6 +38,7 @@ #include <sstream> #include <google/protobuf/text_format.h> +#include <grpc++/support/config.h> namespace grpc { namespace testing { |