diff options
| author |  Yang Gao <yangg@google.com> | 2015-03-02 15:19:25 -0800 |
|---|---|---|
| committer | Yang Gao <yangg@google.com> | 2015-03-02 15:19:25 -0800 |
| commit | 91cc48160a3f5c41c1ec0c9efb3b44e6a836f434 (patch) | |
| tree | c3bb57a5cb75472420aefe057e9fe3443d65e41f /examples | |
| parent | 595884250ed1f773889da9f62b9aa2764bf7cb15 (diff) | |
| parent | fa054b37a19bb063121d2e3dd1bc9530a12c8c35 (diff) | |
Merge remote-tracking branch 'upstream/master' into pubsub
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/pubsub/publisher.h | 6 | ||||
| -rw-r--r-- | examples/pubsub/subscriber.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/examples/pubsub/publisher.h b/examples/pubsub/publisher.h index 2d64a2abfa..c90406ffef 100644 --- a/examples/pubsub/publisher.h +++ b/examples/pubsub/publisher.h @@ -31,8 +31,8 @@ * */ -#ifndef __GRPCPP_EXAMPLES_PUBSUB_PUBLISHER_H_ -#define __GRPCPP_EXAMPLES_PUBSUB_PUBLISHER_H_ +#ifndef GRPC_EXAMPLES_PUBSUB_PUBLISHER_H +#define GRPC_EXAMPLES_PUBSUB_PUBLISHER_H #include <grpc++/channel_interface.h> #include <grpc++/status.h> @@ -64,4 +64,4 @@ class Publisher { } // namespace examples } // namespace grpc -#endif // __GRPCPP_EXAMPLES_PUBSUB_PUBLISHER_H_ +#endif // GRPC_EXAMPLES_PUBSUB_PUBLISHER_H diff --git a/examples/pubsub/subscriber.h b/examples/pubsub/subscriber.h index a973cd755c..c587c01b82 100644 --- a/examples/pubsub/subscriber.h +++ b/examples/pubsub/subscriber.h @@ -31,8 +31,8 @@ * */ -#ifndef __GRPCPP_EXAMPLES_PUBSUB_SUBSCRIBER_H_ -#define __GRPCPP_EXAMPLES_PUBSUB_SUBSCRIBER_H_ +#ifndef GRPC_EXAMPLES_PUBSUB_SUBSCRIBER_H +#define GRPC_EXAMPLES_PUBSUB_SUBSCRIBER_H #include <grpc++/channel_interface.h> #include <grpc++/status.h> @@ -65,4 +65,4 @@ class Subscriber { } // namespace examples } // namespace grpc -#endif // __GRPCPP_EXAMPLES_PUBSUB_SUBSCRIBER_H_ +#endif // GRPC_EXAMPLES_PUBSUB_SUBSCRIBER_H |