diff options
| author |  David Garcia Quintas <dgq@google.com> | 2016-08-30 09:27:19 -0700 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2016-08-30 09:27:19 -0700 |
| commit | 621e2b1a49f5a0c12548eae5fb1f98665dda3e22 (patch) | |
| tree | 5cc5bb63a0d74830a802172c672257df85005427 | |
| parent | f3581bf90acb0d7dabd62ca2e6abf813b7f5e264 (diff) | |
Merge with newly added/modified files
| -rw-r--r-- | include/grpc++/impl/codegen/thrift_serializer.h | 4 | ||||
| -rw-r--r-- | include/grpc++/impl/codegen/thrift_utils.h | 2 | ||||
| -rw-r--r-- | src/cpp/common/channel_filter.h | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/include/grpc++/impl/codegen/thrift_serializer.h b/include/grpc++/impl/codegen/thrift_serializer.h index 7308a1577c..fd324a994f 100644 --- a/include/grpc++/impl/codegen/thrift_serializer.h +++ b/include/grpc++/impl/codegen/thrift_serializer.h @@ -34,10 +34,8 @@ #ifndef GRPCXX_IMPL_CODEGEN_THRIFT_SERIALIZER_H #define GRPCXX_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 <thrift/protocol/TBinaryProtocol.h> #include <thrift/protocol/TCompactProtocol.h> #include <thrift/protocol/TProtocolException.h> @@ -216,4 +214,4 @@ typedef ThriftSerializer<void, TCompactProtocolT<TBufferBase>> } // namespace thrift } // namespace apache -#endif
\ No newline at end of file +#endif 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> diff --git a/src/cpp/common/channel_filter.h b/src/cpp/common/channel_filter.h index ec2af63afd..6f5af3dec3 100644 --- a/src/cpp/common/channel_filter.h +++ b/src/cpp/common/channel_filter.h @@ -36,7 +36,7 @@ #include <grpc++/impl/codegen/config.h> #include <grpc/grpc.h> -#include <grpc/impl/codegen/alloc.h> +#include <grpc/support/alloc.h> #include <functional> #include <vector> |