diff --git a/examples/pubsub/publisher_test.cc b/examples/pubsub/publisher_test.cc index b7bea5b1bd25e12da37f65a10a85f0a71cc07c13..4539557a35b64310c9fa9638665afdedd1aeaddf 100644 --- a/examples/pubsub/publisher_test.cc +++ b/examples/pubsub/publisher_test.cc @@ -110,7 +110,8 @@ class PublisherTest : public ::testing::Test { builder.RegisterService(&service_); server_ = builder.BuildAndStart(); - channel_ = CreateChannel(server_address_.str(), ChannelArguments()); + channel_ = + CreateChannelDeprecated(server_address_.str(), ChannelArguments()); publisher_.reset(new grpc::examples::pubsub::Publisher(channel_)); } diff --git a/examples/pubsub/subscriber_test.cc b/examples/pubsub/subscriber_test.cc index 1fdcc8f755f435978fe2b77aac087172d50808b3..c634aa4f82363cafa7a3a6fd670a7e0c5a411398 100644 --- a/examples/pubsub/subscriber_test.cc +++ b/examples/pubsub/subscriber_test.cc @@ -109,7 +109,8 @@ class SubscriberTest : public ::testing::Test { builder.RegisterService(&service_); server_ = builder.BuildAndStart(); - channel_ = CreateChannel(server_address_.str(), ChannelArguments()); + channel_ = + CreateChannelDeprecated(server_address_.str(), ChannelArguments()); subscriber_.reset(new grpc::examples::pubsub::Subscriber(channel_)); } diff --git a/include/grpc++/create_channel.h b/include/grpc++/create_channel.h index eadabda3596638c9cc253bc4ee9be742d10f9124..80ca0c4dc476d9a109af979b4c201e8f709075ed 100644 --- a/include/grpc++/create_channel.h +++ b/include/grpc++/create_channel.h @@ -43,8 +43,10 @@ namespace grpc { class ChannelArguments; class ChannelInterface; -std::shared_ptr<ChannelInterface> CreateChannel(const grpc::string& target, - const ChannelArguments& args); +// Deprecation warning: This function will soon be deleted +// (See pull request #711) +std::shared_ptr<ChannelInterface> CreateChannelDeprecated( + const grpc::string& target, const ChannelArguments& args); // If creds does not hold an object or is invalid, a lame channel is returned. std::shared_ptr<ChannelInterface> CreateChannel( diff --git a/src/cpp/client/create_channel.cc b/src/cpp/client/create_channel.cc index acf51cb90b194c1acff6585a73463e8618b6be63..583e072799bfd4a379772de76b07555f9c3d2397 100644 --- a/src/cpp/client/create_channel.cc +++ b/src/cpp/client/create_channel.cc @@ -40,8 +40,8 @@ namespace grpc { class ChannelArguments; -std::shared_ptr<ChannelInterface> CreateChannel(const grpc::string &target, - const ChannelArguments &args) { +std::shared_ptr<ChannelInterface> CreateChannelDeprecated( + const grpc::string &target, const ChannelArguments &args) { return std::shared_ptr<ChannelInterface>(new Channel(target, args)); } diff --git a/test/cpp/end2end/async_end2end_test.cc b/test/cpp/end2end/async_end2end_test.cc index 248e054e49a5e1356c0f6fa954cead756b6f70a1..c36ff42949851cc08df3636da7ca0e9106857662 100644 --- a/test/cpp/end2end/async_end2end_test.cc +++ b/test/cpp/end2end/async_end2end_test.cc @@ -105,7 +105,7 @@ class AsyncEnd2endTest : public ::testing::Test { void ResetStub() { std::shared_ptr<ChannelInterface> channel = - CreateChannel(server_address_.str(), ChannelArguments()); + CreateChannelDeprecated(server_address_.str(), ChannelArguments()); stub_.reset(grpc::cpp::test::util::TestService::NewStub(channel)); } diff --git a/test/cpp/end2end/end2end_test.cc b/test/cpp/end2end/end2end_test.cc index d4ca3ef49e40208939936d8d6632b4d723ffc937..df370d493ccae92ee93616099a9a7f6d951b0d2a 100644 --- a/test/cpp/end2end/end2end_test.cc +++ b/test/cpp/end2end/end2end_test.cc @@ -161,7 +161,7 @@ class End2endTest : public ::testing::Test { void ResetStub() { std::shared_ptr<ChannelInterface> channel = - CreateChannel(server_address_.str(), ChannelArguments()); + CreateChannelDeprecated(server_address_.str(), ChannelArguments()); stub_.reset(grpc::cpp::test::util::TestService::NewStub(channel)); } @@ -382,7 +382,7 @@ TEST_F(End2endTest, BidiStream) { // The two stubs are created on the same channel. TEST_F(End2endTest, DiffPackageServices) { std::shared_ptr<ChannelInterface> channel = - CreateChannel(server_address_.str(), ChannelArguments()); + CreateChannelDeprecated(server_address_.str(), ChannelArguments()); EchoRequest request; EchoResponse response; diff --git a/test/cpp/util/create_test_channel.cc b/test/cpp/util/create_test_channel.cc index b0472d32a99e9b452b24ef7b38fd3f2488bfcffe..cf93589af527b073885af466e32897748f47c7b9 100644 --- a/test/cpp/util/create_test_channel.cc +++ b/test/cpp/util/create_test_channel.cc @@ -79,7 +79,7 @@ std::shared_ptr<ChannelInterface> CreateTestChannel( } return CreateChannel(connect_to, channel_creds, channel_args); } else { - return CreateChannel(server, channel_args); + return CreateChannelDeprecated(server, channel_args); } }