diff options
author | yang-g <yangg@google.com> | 2015-08-19 16:28:09 -0700 |
---|---|---|
committer | yang-g <yangg@google.com> | 2015-08-19 16:28:09 -0700 |
commit | 8c2be9f22807870585111d88f5168dd11da99ce1 (patch) | |
tree | 2f7d8a372e68cb2c7ad04777e50bfbf927ededc6 /examples | |
parent | 89bede02f16905eb48b71710dc4ea2542b3a5ca1 (diff) |
Remove ChannelInterface and replace it with Channel
Diffstat (limited to 'examples')
-rw-r--r-- | examples/pubsub/main.cc | 4 | ||||
-rw-r--r-- | examples/pubsub/publisher.cc | 2 | ||||
-rw-r--r-- | examples/pubsub/publisher.h | 4 | ||||
-rw-r--r-- | examples/pubsub/publisher_test.cc | 6 | ||||
-rw-r--r-- | examples/pubsub/subscriber.cc | 2 | ||||
-rw-r--r-- | examples/pubsub/subscriber.h | 4 | ||||
-rw-r--r-- | examples/pubsub/subscriber_test.cc | 4 |
7 files changed, 13 insertions, 13 deletions
diff --git a/examples/pubsub/main.cc b/examples/pubsub/main.cc index b1898f18d9..fcee3b316b 100644 --- a/examples/pubsub/main.cc +++ b/examples/pubsub/main.cc @@ -41,7 +41,7 @@ #include <grpc/support/log.h> #include <gflags/gflags.h> #include <grpc++/channel_arguments.h> -#include <grpc++/channel_interface.h> +#include <grpc++/channel.h> #include <grpc++/create_channel.h> #include <grpc++/credentials.h> #include <grpc++/status.h> @@ -72,7 +72,7 @@ int main(int argc, char** argv) { ss << FLAGS_server_host << ":" << FLAGS_server_port; std::shared_ptr<grpc::Credentials> creds = grpc::GoogleDefaultCredentials(); - std::shared_ptr<grpc::ChannelInterface> channel = + std::shared_ptr<grpc::Channel> channel = grpc::CreateChannel(ss.str(), creds, grpc::ChannelArguments()); grpc::examples::pubsub::Publisher publisher(channel); diff --git a/examples/pubsub/publisher.cc b/examples/pubsub/publisher.cc index 458050af73..fd38ca92ed 100644 --- a/examples/pubsub/publisher.cc +++ b/examples/pubsub/publisher.cc @@ -50,7 +50,7 @@ namespace grpc { namespace examples { namespace pubsub { -Publisher::Publisher(std::shared_ptr<ChannelInterface> channel) +Publisher::Publisher(std::shared_ptr<Channel> channel) : stub_(PublisherService::NewStub(channel)) {} void Publisher::Shutdown() { stub_.reset(); } diff --git a/examples/pubsub/publisher.h b/examples/pubsub/publisher.h index 33bcf98df4..b98e6973dc 100644 --- a/examples/pubsub/publisher.h +++ b/examples/pubsub/publisher.h @@ -34,7 +34,7 @@ #ifndef GRPC_EXAMPLES_PUBSUB_PUBLISHER_H #define GRPC_EXAMPLES_PUBSUB_PUBLISHER_H -#include <grpc++/channel_interface.h> +#include <grpc++/channel.h> #include <grpc++/status.h> #include "examples/pubsub/pubsub.grpc.pb.h" @@ -45,7 +45,7 @@ namespace pubsub { class Publisher { public: - Publisher(std::shared_ptr<ChannelInterface> channel); + Publisher(std::shared_ptr<Channel> channel); void Shutdown(); Status CreateTopic(const grpc::string& topic); diff --git a/examples/pubsub/publisher_test.cc b/examples/pubsub/publisher_test.cc index 6b9dcacc49..972b426e64 100644 --- a/examples/pubsub/publisher_test.cc +++ b/examples/pubsub/publisher_test.cc @@ -32,7 +32,7 @@ */ #include <grpc++/channel_arguments.h> -#include <grpc++/channel_interface.h> +#include <grpc++/channel.h> #include <grpc++/client_context.h> #include <grpc++/create_channel.h> #include <grpc++/server.h> @@ -46,7 +46,7 @@ #include "test/core/util/port.h" #include "test/core/util/test_config.h" -using grpc::ChannelInterface; +using grpc::Channel; namespace grpc { namespace testing { @@ -124,7 +124,7 @@ class PublisherTest : public ::testing::Test { std::unique_ptr<Server> server_; PublisherServiceImpl service_; - std::shared_ptr<ChannelInterface> channel_; + std::shared_ptr<Channel> channel_; std::unique_ptr<grpc::examples::pubsub::Publisher> publisher_; }; diff --git a/examples/pubsub/subscriber.cc b/examples/pubsub/subscriber.cc index d9e0292ba0..0818f501db 100644 --- a/examples/pubsub/subscriber.cc +++ b/examples/pubsub/subscriber.cc @@ -48,7 +48,7 @@ namespace grpc { namespace examples { namespace pubsub { -Subscriber::Subscriber(std::shared_ptr<ChannelInterface> channel) +Subscriber::Subscriber(std::shared_ptr<Channel> channel) : stub_(SubscriberService::NewStub(channel)) {} void Subscriber::Shutdown() { stub_.reset(); } diff --git a/examples/pubsub/subscriber.h b/examples/pubsub/subscriber.h index 40ab45471d..87c833102c 100644 --- a/examples/pubsub/subscriber.h +++ b/examples/pubsub/subscriber.h @@ -34,7 +34,7 @@ #ifndef GRPC_EXAMPLES_PUBSUB_SUBSCRIBER_H #define GRPC_EXAMPLES_PUBSUB_SUBSCRIBER_H -#include <grpc++/channel_interface.h> +#include <grpc++/channel.h> #include <grpc++/status.h> #include "examples/pubsub/pubsub.grpc.pb.h" @@ -45,7 +45,7 @@ namespace pubsub { class Subscriber { public: - Subscriber(std::shared_ptr<ChannelInterface> channel); + Subscriber(std::shared_ptr<Channel> channel); void Shutdown(); Status CreateSubscription(const grpc::string& topic, diff --git a/examples/pubsub/subscriber_test.cc b/examples/pubsub/subscriber_test.cc index b0e7fc034b..7974ca88c2 100644 --- a/examples/pubsub/subscriber_test.cc +++ b/examples/pubsub/subscriber_test.cc @@ -32,7 +32,7 @@ */ #include <grpc++/channel_arguments.h> -#include <grpc++/channel_interface.h> +#include <grpc++/channel.h> #include <grpc++/client_context.h> #include <grpc++/create_channel.h> #include <grpc++/server.h> @@ -122,7 +122,7 @@ class SubscriberTest : public ::testing::Test { std::unique_ptr<Server> server_; SubscriberServiceImpl service_; - std::shared_ptr<ChannelInterface> channel_; + std::shared_ptr<Channel> channel_; std::unique_ptr<grpc::examples::pubsub::Subscriber> subscriber_; }; |