diff options
| author |  David Garcia Quintas <dgq@google.com> | 2015-07-01 14:52:44 -0700 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2015-07-01 14:52:44 -0700 |
| commit | 8a187099ec8accf4f4b9c1bcea0a71d023f6389b (patch) | |
| tree | ae197d56afaf80aff6a1cb6dba715dba665572bf /include/grpc++ | |
| parent | d7d9ce27c523798384051246e18e3f00b29dd8c9 (diff) | |
| parent | f8c63562c1388262c5588e381c05cb0c02e5b406 (diff) | |
Merge branch 'master' of github.com:grpc/grpc into decompression
# Conflicts:
# Makefile
# gRPC.podspec
# src/core/surface/call.c
# src/core/transport/chttp2/frame_data.c
# tools/doxygen/Doxyfile.core.internal
# vsprojects/Grpc.mak
Diffstat (limited to 'include/grpc++')
| -rw-r--r-- | include/grpc++/completion_queue.h | 2 | ||||
| -rw-r--r-- | include/grpc++/impl/call.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/grpc++/completion_queue.h b/include/grpc++/completion_queue.h index a3e7a9c9f4..f32cbff06c 100644 --- a/include/grpc++/completion_queue.h +++ b/include/grpc++/completion_queue.h @@ -36,6 +36,7 @@ #include <grpc/support/time.h> #include <grpc++/impl/grpc_library.h> +#include <grpc++/status.h> #include <grpc++/time.h> struct grpc_completion_queue; @@ -70,7 +71,6 @@ class RpcMethod; class Server; class ServerBuilder; class ServerContext; -class Status; class CompletionQueueTag { public: diff --git a/include/grpc++/impl/call.h b/include/grpc++/impl/call.h index 33e66816f5..64fa5d6efb 100644 --- a/include/grpc++/impl/call.h +++ b/include/grpc++/impl/call.h @@ -41,6 +41,7 @@ #include <grpc++/status.h> #include <grpc++/impl/serialization_traits.h> +#include <functional> #include <memory> #include <map> |