diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-04-13 10:08:44 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-04-13 10:08:44 -0700 |
| commit | 0a949988260e39222e243f9e8c348cbb7cb1a06a (patch) | |
| tree | a4156f789ec40aaf2706b12d00781a9f704b4d3b /examples | |
| parent | f7262057e6fff03544311cd95ea584218062e2ab (diff) | |
| parent | fba547644c7e55ae222cb130cb289e19db43b449 (diff) | |
Merge github.com:grpc/grpc into windows-fixes
Conflicts:
BUILD
src/core/iomgr/tcp_server.h
src/core/iomgr/tcp_server_posix.c
src/core/iomgr/tcp_server_windows.c
src/core/security/server_secure_chttp2.c
src/core/surface/completion_queue.c
src/core/surface/completion_queue.h
src/core/surface/server.c
test/core/end2end/tests/cancel_after_invoke.c
test/core/end2end/tests/cancel_test_helpers.h
tools/run_tests/tests.json
vsprojects/vs2013/Grpc.mak
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 { |