Merge branch 'master' of github.com:kentonv/capnproto

c++/src/kj/common.h

@@ -1329,7 +1329,7 @@ _::Deferred<Func> defer(Func&& func) {
   // you need to assign to an `auto` variable.
   //
   // The KJ_DEFER macro provides slightly more convenient syntax for the common case where you
-  // want some code to run at function exit.
+  // want some code to run at current scope exit.
 
   return _::Deferred<Func>(kj::fwd<Func>(func));
 }

c++/src/kj/io.c++

@@ -322,11 +322,9 @@ void FdOutputStream::write(const void* buffer, size_t size) {
 void FdOutputStream::write(ArrayPtr<const ArrayPtr<const byte>> pieces) {
 #if _WIN32
   // Windows has no reasonable writev(). It has WriteFileGather, but this call has the unreasonable
-  // restriction that each segment must be page-aligned. So, fall back to write().
+  // restriction that each segment must be page-aligned. So, fall back to the default implementation
 
-  for (auto piece: pieces) {
-    write(piece.begin(), piece.size());
-  }
+  OutputStream::write(pieces);
 
 #else
   const size_t iovmax = miniposix::iovMax(pieces.size());