Merged from master and resolved merge conflicts

4 files changed, 13 insertions, 9 deletions

diff --git a/include/grpc++/client_context.h b/include/grpc++/client_context.h
index 7a20ffa005..e286b437e4 100644
--- a/include/grpc++/client_context.h
+++ b/include/grpc++/client_context.h
@@ -137,10 +137,10 @@ class PropagationOptions {
     return *this;
   }
 
-  gpr_uint32 c_bitmask() const { return propagate_; }
+  uint32_t c_bitmask() const { return propagate_; }
 
  private:
-  gpr_uint32 propagate_;
+  uint32_t propagate_;
 };
 
 namespace testing {
diff --git a/include/grpc++/impl/call.h b/include/grpc++/impl/call.h
index df45d6f485..cb7856bfbe 100644
--- a/include/grpc++/impl/call.h
+++ b/include/grpc++/impl/call.h
@@ -70,7 +70,7 @@ class WriteOptions {
   inline void Clear() { flags_ = 0; }
 
   /// Returns raw flags bitset.
-  inline gpr_uint32 flags() const { return flags_; }
+  inline uint32_t flags() const { return flags_; }
 
   /// Sets flag for the disabling of compression for the next message write.
   ///
@@ -126,13 +126,13 @@ class WriteOptions {
   }
 
  private:
-  void SetBit(const gpr_uint32 mask) { flags_ |= mask; }
+  void SetBit(const uint32_t mask) { flags_ |= mask; }
 
-  void ClearBit(const gpr_uint32 mask) { flags_ &= ~mask; }
+  void ClearBit(const uint32_t mask) { flags_ &= ~mask; }
 
-  bool GetBit(const gpr_uint32 mask) const { return (flags_ & mask) != 0; }
+  bool GetBit(const uint32_t mask) const { return (flags_ & mask) != 0; }
 
-  gpr_uint32 flags_;
+  uint32_t flags_;
 };
 
 /// Default argument for CallOpSet. I is unused by the class, but can be
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 456379cc5b..be316e7c94 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;