Hi Ben,
2027 applies fine for me on a clean git tree.
$ git apply ../ben-2027-misc_minor.patch
../ben-2027-misc_minor.patch:10: trailing whitespace.
nextIOThread_ = static_cast<uint32_t>((nextIOThread_ + 1) %
ioThreads_.size()
;
../ben-2027-misc_minor.patch:19: trailing whitespace.
long nBytes = recv(fd, cast_sockopt(&connection), kSize, 0);
../ben-2027-misc_minor.patch:32: trailing whitespace.
transport_->write((const uint8_t*)header.c_str(),
static_cast<uint32_t>(hea
er.size()));
../ben-2027-misc_minor.patch:45: trailing whitespace.
int give = (std::min)((uint32_t) readAvail(), need);
error: patch failed: lib/cpp/src/thrift/server/TNonblockingServer.cpp:895
error: lib/cpp/src/thrift/server/TNonblockingServer.cpp: patch does not
apply
error: patch failed: lib/cpp/src/thrift/transport/THttpServer.cpp:92
error: lib/cpp/src/thrift/transport/THttpServer.cpp: patch does not apply
error: patch failed: lib/cpp/src/thrift/transport/TZlibTransport.cpp:144
error: lib/cpp/src/thrift/transport/TZlibTransport.cpp: patch does not apply
Have fun,
JensG
-----Ursprüngliche Nachricht-----
From: Ben Craig
Sent: Monday, October 7, 2013 10:50 PM
To: dev@thrift.apache.org
Subject: Re: Looking for +1s to several of my patches
From: "Jens Geyer" <jensge...@hotmail.com>
To: <dev@thrift.apache.org>,
Date: 10/07/2013 02:25 PM
Subject: Re: Looking for +1s to several of my patches
Hi Ben,
I tried a few of the simpler and/or MinGW related ones but unfortunately
they all do not apply cleanly. In particular, I looked at 2027, 2031 and
2045 so far.
Jens
Thanks for looking at those. Sorry they didn't apply. I have refreshed
2031 and 2045. 2027 applies fine for me on a clean git tree.
The -1 -> THRIFT_INVALID_SOCKET change was great, but it sure did break a
lot of patches.
