diff options
author | Sree Kuchibhotla <sreek@google.com> | 2016-01-13 22:43:20 -0800 |
---|---|---|
committer | Sree Kuchibhotla <sreek@google.com> | 2016-01-13 22:43:20 -0800 |
commit | 5a05f51a1c7de7f17bef1ce904afba67426992bb (patch) | |
tree | 2fe56c74dc5c15055a05b5ca3c83946d29f4daa3 /test/cpp/end2end/server_crash_test.cc | |
parent | 16a7dee6141785092ee2aae4a11d2e9f590a1847 (diff) |
Rename TestService to EchoTestService to prevent name-conflict with
'TestService' in test.proto
Diffstat (limited to 'test/cpp/end2end/server_crash_test.cc')
-rw-r--r-- | test/cpp/end2end/server_crash_test.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/test/cpp/end2end/server_crash_test.cc b/test/cpp/end2end/server_crash_test.cc index 87ce6369d2..e447360276 100644 --- a/test/cpp/end2end/server_crash_test.cc +++ b/test/cpp/end2end/server_crash_test.cc @@ -31,21 +31,21 @@ * */ -#include <grpc/grpc.h> -#include <grpc/support/thd.h> -#include <grpc/support/time.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 <grpc/support/thd.h> +#include <grpc/support/time.h> #include <gtest/gtest.h> +#include "src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.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 "src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.h" #include "test/cpp/util/subprocess.h" using grpc::testing::EchoRequest; @@ -59,7 +59,8 @@ namespace testing { namespace { -class ServiceImpl GRPC_FINAL : public ::grpc::testing::TestService::Service { +class ServiceImpl GRPC_FINAL + : public ::grpc::testing::EchoTestService::Service { public: ServiceImpl() : bidi_stream_count_(0), response_stream_count_(0) {} |