diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-12-12 07:16:03 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-12-12 07:16:03 -0800 |
| commit | 6d379a90afcdb9bbfc381d92dc7e4b99e5fc0a4a (patch) | |
| tree | 939bbc32a8ee6feb39cf366ba5d72196fc925315 /include/grpc/impl/codegen/slice.h | |
| parent | 1a7c57bf6c939fc3f9a478191f93f997192653f4 (diff) | |
| parent | 4603a1c7a43347fd7139c619112de82c03f7b18a (diff) | |
Merge github.com:grpc/grpc into slice_with_exec_ctx
Diffstat (limited to 'include/grpc/impl/codegen/slice.h')
| -rw-r--r-- | include/grpc/impl/codegen/slice.h | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/include/grpc/impl/codegen/slice.h b/include/grpc/impl/codegen/slice.h index 00781bb76b..4d4a86fa22 100644 --- a/include/grpc/impl/codegen/slice.h +++ b/include/grpc/impl/codegen/slice.h @@ -38,7 +38,6 @@ #include <stdint.h> #include <grpc/impl/codegen/exec_ctx_fwd.h> -#include <grpc/impl/codegen/gpr_slice.h> /* Slice API @@ -118,22 +117,4 @@ typedef struct { GRPC_SLICE_START_PTR(slice) + GRPC_SLICE_LENGTH(slice) #define GRPC_SLICE_IS_EMPTY(slice) (GRPC_SLICE_LENGTH(slice) == 0) -#ifdef GRPC_ALLOW_GPR_SLICE_FUNCTIONS - -/* Duplicate GPR_* definitions */ -#define GPR_SLICE_START_PTR(slice) \ - ((slice).refcount ? (slice).data.refcounted.bytes \ - : (slice).data.inlined.bytes) -#define GPR_SLICE_LENGTH(slice) \ - ((slice).refcount ? (slice).data.refcounted.length \ - : (slice).data.inlined.length) -#define GPR_SLICE_SET_LENGTH(slice, newlen) \ - ((slice).refcount ? ((slice).data.refcounted.length = (size_t)(newlen)) \ - : ((slice).data.inlined.length = (uint8_t)(newlen))) -#define GPR_SLICE_END_PTR(slice) \ - GRPC_SLICE_START_PTR(slice) + GRPC_SLICE_LENGTH(slice) -#define GPR_SLICE_IS_EMPTY(slice) (GRPC_SLICE_LENGTH(slice) == 0) - -#endif /* GRPC_ALLOW_GPR_SLICE_FUNCTIONS */ - #endif /* GRPC_IMPL_CODEGEN_SLICE_H */ |