diff options
| author |  Mark D. Roth <roth@google.com> | 2016-09-16 10:51:15 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-09-16 10:51:15 -0700 |
| commit | 8b7678cf846cc5b51cd4fc459c7a8d7a2aaebc01 (patch) | |
| tree | 3c7981a52213e191da0fd31ad3e99149025d4778 /include/grpc++/impl/codegen/thrift_utils.h | |
| parent | cf218fb7485644d1138d3b996752da05ae015926 (diff) | |
| parent | 708d35fd2b54941d1741d3c9e6fc01fea91a30f3 (diff) | |
Merge remote-tracking branch 'upstream/master' into http_connect
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> |