diff options
| author |  David Garcia Quintas <dgq@google.com> | 2016-01-14 13:57:55 -0800 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2016-01-14 13:57:55 -0800 |
| commit | 752c36a58852e2cbb40abcb9a3dc4191023e24ce (patch) | |
| tree | 020f13053b6cf104b7039ebd3517ec35a0cf4eff /include/grpc++/support | |
| parent | e50c6c2f5ed36d8559de5c23364f7e0d656daab8 (diff) | |
| parent | f8eacca8cdcf944c5c023f85abc76344ba451dc5 (diff) | |
Merge branch 'master' of github.com:grpc/grpc into proto_interfaces
Diffstat (limited to 'include/grpc++/support')
| -rw-r--r-- | include/grpc++/support/byte_buffer.h | 6 | ||||
| -rw-r--r-- | include/grpc++/support/slice.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/grpc++/support/byte_buffer.h b/include/grpc++/support/byte_buffer.h index d3f9b7b1d1..84042cbef8 100644 --- a/include/grpc++/support/byte_buffer.h +++ b/include/grpc++/support/byte_buffer.h @@ -1,6 +1,6 @@ /* * - * Copyright 2015, Google Inc. + * Copyright 2015-2016, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -57,7 +57,7 @@ class ByteBuffer GRPC_FINAL { /// Constuct a byte buffer by referencing elements of existing buffer /// \a buf. Wrapper of core function grpc_byte_buffer_copy - ByteBuffer(const ByteBuffer&buf); + ByteBuffer(const ByteBuffer& buf); ~ByteBuffer(); @@ -107,4 +107,4 @@ class SerializationTraits<ByteBuffer, void> { } // namespace grpc -#endif // GRPCXX_SUPPORT_BYTE_BUFFER_H +#endif // GRPCXX_SUPPORT_BYTE_BUFFER_H
\ No newline at end of file diff --git a/include/grpc++/support/slice.h b/include/grpc++/support/slice.h index 8dce7e68af..30325ef90b 100644 --- a/include/grpc++/support/slice.h +++ b/include/grpc++/support/slice.h @@ -1,6 +1,6 @@ /* * - * Copyright 2015, Google Inc. + * Copyright 2015-2016, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -85,4 +85,4 @@ class Slice GRPC_FINAL { } // namespace grpc -#endif // GRPCXX_SUPPORT_SLICE_H +#endif // GRPCXX_SUPPORT_SLICE_H
\ No newline at end of file |