grpc
/
grpc-experiments
mirror of https://github.com/grpc/grpc-experiments.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

resolve conflict

This commit is contained in:
Yang Gao 2015-03-09 22:25:28 -07:00
parent 2365ad193b 072b561654
commit 2daa126709
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
README.md
View File

@ -249,15 +249,15 @@ tutorial for your chosen language: check if there's one available yet in the rel
Our server application has two classes: Our server application has two classes:
- a main server class that hosts the service implementation and allows access over the - a main server class that hosts the service implementation and allows access over the
network: [HelloWorldServer.java](https://github.com/grpc/grpc-java/blob/master/examples/src/main/java/io/grpc/examples/HelloWorldServer.java). network: [HelloWorldServer.java](https://github.com/grpc/grpc-java/blob/master/examples/src/main/java/io/grpc/examples/helloworld/HelloWorldServer.java).
- a simple service implementation class [GreeterImpl.java](https://github.com/grpc/grpc-java/blob/master/examples/src/main/java/io/grpc/examples/HelloWorldServer.java#L51). - a simple service implementation class [GreeterImpl.java](https://github.com/grpc/grpc-java/blob/master/examples/src/main/java/io/grpc/examples/helloworld/HelloWorldServer.java#L51).
#### Service implementation #### Service implementation
[GreeterImpl.java](https://github.com/grpc/grpc-java/blob/master/examples/src/main/java/io/grpc/examples/HelloWorldServer.java#L51) [GreeterImpl.java](https://github.com/grpc/grpc-java/blob/master/examples/src/main/java/io/grpc/examples/helloworld/HelloWorldServer.java#L51)
actually implements our GreetingService's required behaviour. actually implements our GreetingService's required behaviour.
As you can see, the class `GreeterImpl` implements the interface As you can see, the class `GreeterImpl` implements the interface
@ -286,7 +286,7 @@ message, as specified in our interface definition.
#### Server implementation #### Server implementation
[HelloWorldServer.java](https://github.com/grpc/grpc-java/blob/master/examples/src/main/java/io/grpc/examples/HelloWorldServer.java) [HelloWorldServer.java](https://github.com/grpc/grpc-java/blob/master/examples/src/main/java/io/grpc/examples/helloworld/HelloWorldServer.java)
shows the other main feature required to provide a gRPC service; making the service shows the other main feature required to provide a gRPC service; making the service
implementation available from the network. implementation available from the network.
@ -324,7 +324,7 @@ how all this works in a bit more detail in our language-specific documentation.
Client-side gRPC is pretty simple. In this step, we'll use the generated code Client-side gRPC is pretty simple. In this step, we'll use the generated code
to write a simple client that can access the `Greeter` server we created to write a simple client that can access the `Greeter` server we created
in the [previous section](#server). You can see the complete client code in in the [previous section](#server). You can see the complete client code in
[HelloWorldClient.java](https://github.com/grpc/grpc-java/blob/master/examples/src/main/java/io/grpc/examples/HelloWorldClient.java). [HelloWorldClient.java](https://github.com/grpc/grpc-java/blob/master/examples/src/main/java/io/grpc/examples/helloworld/HelloWorldClient.java).
Again, we're not going to go into much detail about how to implement a client; Again, we're not going to go into much detail about how to implement a client;
we'll leave that for the tutorial. we'll leave that for the tutorial.

6
cpp/helloworld/Makefile
View File

@ -30,9 +30,9 @@
# #
CXX = g++ CXX = g++
CPPFLAGS = -I/usr/local/include -pthread CPPFLAGS += -I/usr/local/include -pthread
CXXFLAGS = -std=c++11 CXXFLAGS += -std=c++11
LDFLAGS = -L/usr/local/lib -lgrpc++_unsecure -lgrpc -lgpr -lprotobuf -lpthread -ldl LDFLAGS += -L/usr/local/lib -lgrpc++_unsecure -lgrpc -lgpr -lprotobuf -lpthread -ldl
PROTOC = protoc PROTOC = protoc
GRPC_CPP_PLUGIN = grpc_cpp_plugin GRPC_CPP_PLUGIN = grpc_cpp_plugin
GRPC_CPP_PLUGIN_PATH ?= `which $(GRPC_CPP_PLUGIN)` GRPC_CPP_PLUGIN_PATH ?= `which $(GRPC_CPP_PLUGIN)`

6
cpp/route_guide/Makefile
View File

@ -30,9 +30,9 @@
# #
CXX = g++ CXX = g++
CPPFLAGS = -I/usr/local/include -pthread CPPFLAGS += -I/usr/local/include -pthread
CXXFLAGS = -std=c++11 CXXFLAGS += -std=c++11
LDFLAGS = -L/usr/local/lib -lgrpc++_unsecure -lgrpc -lgpr -lprotobuf -lpthread -ldl LDFLAGS += -L/usr/local/lib -lgrpc++_unsecure -lgrpc -lgpr -lprotobuf -lpthread -ldl
PROTOC = protoc PROTOC = protoc
GRPC_CPP_PLUGIN = grpc_cpp_plugin GRPC_CPP_PLUGIN = grpc_cpp_plugin
GRPC_CPP_PLUGIN_PATH ?= `which $(GRPC_CPP_PLUGIN)` GRPC_CPP_PLUGIN_PATH ?= `which $(GRPC_CPP_PLUGIN)`