diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-03-04 14:10:56 -0800 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-03-04 14:10:56 -0800 |
| commit | 346a08606a5ce1506d88cf8c6b75a712ce95e1fb (patch) | |
| tree | 34f5d18f834edf5579df657ea7d14c6ce37558a2 /src/cpp | |
| parent | e7460e87d37ad2ff7d829db1731c981c50555d9b (diff) | |
| parent | 9cf9fcaf53bf16c7a688f7f45740e729b503ba75 (diff) | |
Merge github.com:grpc/grpc into credit
Diffstat (limited to 'src/cpp')
| -rw-r--r-- | src/cpp/client/channel.cc | 1 | ||||
| -rw-r--r-- | src/cpp/common/call.cc | 1 | ||||
| -rw-r--r-- | src/cpp/proto/proto_utils.cc | 1 | ||||
| -rw-r--r-- | src/cpp/server/async_server_context.cc | 2 |
4 files changed, 1 insertions, 4 deletions
diff --git a/src/cpp/client/channel.cc b/src/cpp/client/channel.cc index 65bd135d5c..5380d3a232 100644 --- a/src/cpp/client/channel.cc +++ b/src/cpp/client/channel.cc @@ -50,7 +50,6 @@ #include <grpc++/impl/call.h> #include <grpc++/impl/rpc_method.h> #include <grpc++/status.h> -#include <google/protobuf/message.h> namespace grpc { diff --git a/src/cpp/common/call.cc b/src/cpp/common/call.cc index b2b6c62785..6ce1e8a7d5 100644 --- a/src/cpp/common/call.cc +++ b/src/cpp/common/call.cc @@ -31,7 +31,6 @@ * */ -#include <google/protobuf/message.h> #include <grpc/support/alloc.h> #include <grpc++/impl/call.h> #include <grpc++/client_context.h> diff --git a/src/cpp/proto/proto_utils.cc b/src/cpp/proto/proto_utils.cc index e6badd5d6e..72f1bf7441 100644 --- a/src/cpp/proto/proto_utils.cc +++ b/src/cpp/proto/proto_utils.cc @@ -36,7 +36,6 @@ #include <grpc/grpc.h> #include <grpc/support/slice.h> -#include <google/protobuf/message.h> namespace grpc { diff --git a/src/cpp/server/async_server_context.cc b/src/cpp/server/async_server_context.cc index bee75497b8..f21efcfb19 100644 --- a/src/cpp/server/async_server_context.cc +++ b/src/cpp/server/async_server_context.cc @@ -36,7 +36,7 @@ #include <grpc/grpc.h> #include <grpc/support/log.h> #include "src/cpp/proto/proto_utils.h" -#include <google/protobuf/message.h> +#include <grpc++/config.h> #include <grpc++/status.h> namespace grpc { |