Merge branch 'master' into bbuf

2 files changed, 6 insertions, 2 deletions

diff --git a/include/grpc++/support/async_stream.h b/include/grpc++/support/async_stream.h
index b4dae30cd5..823fcd2e8e 100644
--- a/include/grpc++/support/async_stream.h
+++ b/include/grpc++/support/async_stream.h
@@ -85,6 +85,10 @@ class AsyncWriterInterface {
 
   /// Request the writing of \a msg with identifying tag \a tag.
   ///
+  /// Only one write may be outstanding at any given time. This means that
+  /// after calling Write, one must wait to receive \a tag from the completion
+  /// queue BEFORE calling Write again.
+  ///
   /// \param[in] msg The message to be written.
   /// \param[in] tag The tag identifying the operation.
   virtual void Write(const W& msg, void* tag) = 0;
diff --git a/include/grpc++/support/slice.h b/include/grpc++/support/slice.h
index 88e08bedb5..8dce7e68af 100644
--- a/include/grpc++/support/slice.h
+++ b/include/grpc++/support/slice.h
@@ -72,10 +72,10 @@ class Slice GRPC_FINAL {
   size_t size() const { return GPR_SLICE_LENGTH(slice_); }
 
   /// Raw pointer to the beginning (first element) of the slice.
-  const gpr_uint8* begin() const { return GPR_SLICE_START_PTR(slice_); }
+  const uint8_t* begin() const { return GPR_SLICE_START_PTR(slice_); }
 
   /// Raw pointer to the end (one byte \em past the last element) of the slice.
-  const gpr_uint8* end() const { return GPR_SLICE_END_PTR(slice_); }
+  const uint8_t* end() const { return GPR_SLICE_END_PTR(slice_); }
 
  private:
   friend class ByteBuffer;