diff options
| author |  Mark D. Roth <roth@google.com> | 2016-09-16 13:12:21 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-09-16 13:12:21 -0700 |
| commit | eaea5caab3e5c34eea8c17bb8df7e97796f1d5b5 (patch) | |
| tree | 07199f6c9b642ccafca86180d09280a12c740759 /include/grpc++/impl/codegen/thrift_utils.h | |
| parent | 6e3084b02ce806d57225d6404a7866349e98f5c7 (diff) | |
| parent | ee43d7bbb11a36c91c6f1ebff6bf3da70b7546b2 (diff) | |
Merge remote-tracking branch 'upstream/master' into deadline_filter
Diffstat (limited to 'include/grpc++/impl/codegen/thrift_utils.h')
| -rw-r--r-- | include/grpc++/impl/codegen/thrift_utils.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/grpc++/impl/codegen/thrift_utils.h b/include/grpc++/impl/codegen/thrift_utils.h index 7d19b247f4..be558c5789 100644 --- a/include/grpc++/impl/codegen/thrift_utils.h +++ b/include/grpc++/impl/codegen/thrift_utils.h @@ -40,10 +40,8 @@ #include <grpc++/impl/codegen/status.h> #include <grpc++/impl/codegen/status_code_enum.h> #include <grpc++/impl/codegen/thrift_serializer.h> -#include <grpc/impl/codegen/byte_buffer.h> #include <grpc/impl/codegen/byte_buffer_reader.h> #include <grpc/impl/codegen/slice.h> -#include <grpc/impl/codegen/slice_buffer.h> #include <cstdint> #include <cstdlib> |