From de36eb69be02d384ec2d03b93a1bb8e44448f361 Mon Sep 17 00:00:00 2001
From: yang-g <yangg@google.com>
Date: Tue, 25 Aug 2015 15:16:44 -0700
Subject: [PATCH] fix route_guide

---
 cpp/route_guide/route_guide_client.cc | 10 +++-------
 cpp/route_guide/route_guide_server.cc |  2 --
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/cpp/route_guide/route_guide_client.cc b/cpp/route_guide/route_guide_client.cc
index 734ea9f..814def2 100644
--- a/cpp/route_guide/route_guide_client.cc
+++ b/cpp/route_guide/route_guide_client.cc
@@ -39,18 +39,15 @@
 #include <thread>
 
 #include <grpc/grpc.h>
-#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++/credentials.h>
-#include <grpc++/status.h>
-#include <grpc++/stream.h>
 #include "helper.h"
 #include "route_guide.grpc.pb.h"
 
+using grpc::Channel;
 using grpc::ChannelArguments;
-using grpc::ChannelInterface;
 using grpc::ClientContext;
 using grpc::ClientReader;
 using grpc::ClientReaderWriter;
@@ -88,8 +85,7 @@ RouteNote MakeRouteNote(const std::string& message,
 
 class RouteGuideClient {
  public:
-  RouteGuideClient(std::shared_ptr<ChannelInterface> channel,
-                   const std::string& db)
+  RouteGuideClient(std::shared_ptr<Channel> channel, const std::string& db)
       : stub_(RouteGuide::NewStub(channel)) {
     examples::ParseDb(db, &feature_list_);
   }
diff --git a/cpp/route_guide/route_guide_server.cc b/cpp/route_guide/route_guide_server.cc
index 8a0ea26..b375392 100644
--- a/cpp/route_guide/route_guide_server.cc
+++ b/cpp/route_guide/route_guide_server.cc
@@ -43,8 +43,6 @@
 #include <grpc++/server_builder.h>
 #include <grpc++/server_context.h>
 #include <grpc++/server_credentials.h>
-#include <grpc++/status.h>
-#include <grpc++/stream.h>
 #include "helper.h"
 #include "route_guide.grpc.pb.h"