diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2015-04-11 01:27:32 +0200 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2015-04-11 01:53:09 +0200 |
| commit | b7c2035e83a9b3e346f1fd37f9ad55c2070fb02e (patch) | |
| tree | 6d4703d352f4f3204415d6785df52320d3d14a9b /examples | |
| parent | 27a0dc0208e90b6463049df16da6c35216eab0aa (diff) | |
| parent | 05f2d9f8267d69bfeb60f52446385a1955eddd93 (diff) | |
Merge branch 'master' of https://github.com/grpc/grpc into the-purge-2
Conflicts:
test/cpp/end2end/async_end2end_test.cc
test/cpp/end2end/end2end_test.cc
test/cpp/interop/client.cc
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/pubsub/publisher.h | 2 | ||||
| -rw-r--r-- | examples/pubsub/subscriber.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/pubsub/publisher.h b/examples/pubsub/publisher.h index c90406ffef..33bcf98df4 100644 --- a/examples/pubsub/publisher.h +++ b/examples/pubsub/publisher.h @@ -37,7 +37,7 @@ #include <grpc++/channel_interface.h> #include <grpc++/status.h> -#include "examples/pubsub/pubsub.pb.h" +#include "examples/pubsub/pubsub.grpc.pb.h" namespace grpc { namespace examples { diff --git a/examples/pubsub/subscriber.h b/examples/pubsub/subscriber.h index c587c01b82..40ab45471d 100644 --- a/examples/pubsub/subscriber.h +++ b/examples/pubsub/subscriber.h @@ -37,7 +37,7 @@ #include <grpc++/channel_interface.h> #include <grpc++/status.h> -#include "examples/pubsub/pubsub.pb.h" +#include "examples/pubsub/pubsub.grpc.pb.h" namespace grpc { namespace examples { |