Merge pull request #323 from iamqizhao/master

rename proto for route_guide example
2015-08-31 13:03:17 -07:00
parent 18c2aa03d2 28d57dd1ec
commit 94ec56461e
4 changed files with 4 additions and 4 deletions
--- a/examples/route_guide/client/client.go
+++ b/examples/route_guide/client/client.go
@ -46,7 +46,7 @@ import (
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
-	pb "google.golang.org/grpc/examples/route_guide/proto"
+	pb "google.golang.org/grpc/examples/route_guide/routeguide"
 	"google.golang.org/grpc/grpclog"
 )

--- a/examples/route_guide/routeguide/route_guide.pb.go
+++ b/examples/route_guide/routeguide/route_guide.pb.go
@ -15,7 +15,7 @@ It has these top-level messages:
 	RouteNote
 	RouteSummary
 */
-package proto
+package routeguide

 import proto1 "github.com/golang/protobuf/proto"

--- a/examples/route_guide/routeguide/route_guide.proto
+++ b/examples/route_guide/routeguide/route_guide.proto
@ -29,7 +29,7 @@

 syntax = "proto3";

-package proto;
+package routeguide;

 // Interface exported by the server.
 service RouteGuide {
--- a/examples/route_guide/server/server.go
+++ b/examples/route_guide/server/server.go
@ -55,7 +55,7 @@ import (

 	"github.com/golang/protobuf/proto"

-	pb "google.golang.org/grpc/examples/route_guide/proto"
+	pb "google.golang.org/grpc/examples/route_guide/routeguide"
 )

 var (