diff options
| author |  Bogdan Drutu <bdrutu@google.com> | 2016-01-14 17:57:50 -0800 |
|---|---|---|
| committer | Bogdan Drutu <bdrutu@google.com> | 2016-01-14 17:57:50 -0800 |
| commit | 0277270b3a9ea52c4323cae79cee664a7652c41b (patch) | |
| tree | f3c81cd3b3690328e82cd235681c1a22d88400da /include/grpc++ | |
| parent | 5200df6bcb5089ababf679f6bf02de6c3d793e90 (diff) | |
| parent | 7df646667d40390e691616838d35e3e52cdd18c9 (diff) | |
Merge remote-tracking branch 'upstream/master' into bug
Diffstat (limited to 'include/grpc++')
| -rw-r--r-- | include/grpc++/generic/async_generic_service.h | 2 | ||||
| -rw-r--r-- | include/grpc++/support/byte_buffer.h | 2 | ||||
| -rw-r--r-- | include/grpc++/support/slice.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/grpc++/generic/async_generic_service.h b/include/grpc++/generic/async_generic_service.h index 33045b8d85..57a2696b3b 100644 --- a/include/grpc++/generic/async_generic_service.h +++ b/include/grpc++/generic/async_generic_service.h @@ -76,4 +76,4 @@ class AsyncGenericService GRPC_FINAL { } // namespace grpc -#endif // GRPCXX_GENERIC_ASYNC_GENERIC_SERVICE_H
\ No newline at end of file +#endif // GRPCXX_GENERIC_ASYNC_GENERIC_SERVICE_H diff --git a/include/grpc++/support/byte_buffer.h b/include/grpc++/support/byte_buffer.h index 84042cbef8..82591a88ef 100644 --- a/include/grpc++/support/byte_buffer.h +++ b/include/grpc++/support/byte_buffer.h @@ -107,4 +107,4 @@ class SerializationTraits<ByteBuffer, void> { } // namespace grpc -#endif // GRPCXX_SUPPORT_BYTE_BUFFER_H
\ No newline at end of file +#endif // GRPCXX_SUPPORT_BYTE_BUFFER_H diff --git a/include/grpc++/support/slice.h b/include/grpc++/support/slice.h index 30325ef90b..724691a033 100644 --- a/include/grpc++/support/slice.h +++ b/include/grpc++/support/slice.h @@ -85,4 +85,4 @@ class Slice GRPC_FINAL { } // namespace grpc -#endif // GRPCXX_SUPPORT_SLICE_H
\ No newline at end of file +#endif // GRPCXX_SUPPORT_SLICE_H |