aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/grpc++/support
diff options
context:
space:
mode:
authorGravatar yang-g <yangg@google.com>2016-07-12 08:36:26 -0700
committerGravatar yang-g <yangg@google.com>2016-07-12 08:36:26 -0700
commit3e63b4ee7e96ac432227ec7676f9f737c7008b1a (patch)
treefab82225ca672d78034e5c0bf9b4b4b7941dfa72 /include/grpc++/support
parenta324c4fea63840eb06dadb4f0d920226b034404e (diff)
parent2f17797c943b2b58865713b1ffd18e586d3fed02 (diff)
Merge remote-tracking branch 'upstream/master' into slice
Diffstat (limited to 'include/grpc++/support')
-rw-r--r--include/grpc++/support/byte_buffer.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/grpc++/support/byte_buffer.h b/include/grpc++/support/byte_buffer.h
index f6eb09638f..20bd407109 100644
--- a/include/grpc++/support/byte_buffer.h
+++ b/include/grpc++/support/byte_buffer.h
@@ -64,7 +64,7 @@ class ByteBuffer GRPC_FINAL {
ByteBuffer& operator=(const ByteBuffer&);
/// Dump (read) the buffer contents into \a slices.
- void Dump(std::vector<Slice>* slices) const;
+ Status Dump(std::vector<Slice>* slices) const;
/// Remove all data.
void Clear();