You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by cl...@apache.org on 2016/04/23 20:58:40 UTC
qpid-proton git commit: PROTON-1179: c++: connection_engine to use
error_condition. Fix Windows socket::close signature.
Repository: qpid-proton
Updated Branches:
refs/heads/master 337b4364c -> c275b4c59
PROTON-1179: c++: connection_engine to use error_condition. Fix Windows socket::close signature.
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/c275b4c5
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/c275b4c5
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/c275b4c5
Branch: refs/heads/master
Commit: c275b4c597f0dcb5244f96a1a86a37ee8c34c88c
Parents: 337b436
Author: Clifford Jansen <cl...@apache.org>
Authored: Sat Apr 23 11:57:52 2016 -0700
Committer: Clifford Jansen <cl...@apache.org>
Committed: Sat Apr 23 11:57:52 2016 -0700
----------------------------------------------------------------------
proton-c/bindings/cpp/src/io/windows/socket.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/c275b4c5/proton-c/bindings/cpp/src/io/windows/socket.cpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/io/windows/socket.cpp b/proton-c/bindings/cpp/src/io/windows/socket.cpp
index 27660d8..f312525 100644
--- a/proton-c/bindings/cpp/src/io/windows/socket.cpp
+++ b/proton-c/bindings/cpp/src/io/windows/socket.cpp
@@ -107,7 +107,7 @@ void engine::read() {
else if (n == 0)
read_close();
else if (n == SOCKET_ERROR && WSAGetLastError() != WSAEWOULDBLOCK)
- close("io_error", error_str());
+ close(error_condition("io_error", error_str()));
}
}
@@ -118,7 +118,7 @@ void engine::write() {
if (n > 0)
write_done(n);
else if (n == SOCKET_ERROR && WSAGetLastError() != WSAEWOULDBLOCK)
- close("io_error", error_str());
+ close(error_condition("io_error", error_str()));
}
}
@@ -133,7 +133,7 @@ void engine::run() {
FD_SET(socket_, &wr);
int n = ::select(FD_SETSIZE, &rd, &wr, NULL, NULL);
if (n < 0) {
- close("io_error", error_str());
+ close(error_condition("select: ", error_str()));
break;
}
if (FD_ISSET(socket_, &rd)) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org