diff options
Diffstat (limited to 'cpp/src/qpid/sys')
| -rw-r--r-- | cpp/src/qpid/sys/AggregateOutput.cpp | 3 | ||||
| -rw-r--r-- | cpp/src/qpid/sys/Socket.h | 4 | ||||
| -rw-r--r-- | cpp/src/qpid/sys/epoll/EpollPoller.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/qpid/sys/posix/Socket.cpp | 7 |
4 files changed, 9 insertions, 7 deletions
diff --git a/cpp/src/qpid/sys/AggregateOutput.cpp b/cpp/src/qpid/sys/AggregateOutput.cpp index 74eea5ed08..57cc0c5a33 100644 --- a/cpp/src/qpid/sys/AggregateOutput.cpp +++ b/cpp/src/qpid/sys/AggregateOutput.cpp @@ -21,6 +21,7 @@ #include "qpid/sys/AggregateOutput.h" #include "qpid/log/Statement.h" +#include <algorithm> namespace qpid { namespace sys { @@ -54,7 +55,7 @@ void AggregateOutput::addOutputTask(OutputTask* t) void AggregateOutput::removeOutputTask(OutputTask* t) { - TaskList::iterator i = find(tasks.begin(), tasks.end(), t); + TaskList::iterator i = std::find(tasks.begin(), tasks.end(), t); if (i != tasks.end()) tasks.erase(i); } diff --git a/cpp/src/qpid/sys/Socket.h b/cpp/src/qpid/sys/Socket.h index 1594e89aac..0ebfc0c330 100644 --- a/cpp/src/qpid/sys/Socket.h +++ b/cpp/src/qpid/sys/Socket.h @@ -93,8 +93,8 @@ public: */ std::string getLocalAddress() const; - uint getLocalPort() const; - uint getRemotePort() const; + uint16_t getLocalPort() const; + uint16_t getRemotePort() const; /** Accept a connection from a socket that is already listening diff --git a/cpp/src/qpid/sys/epoll/EpollPoller.cpp b/cpp/src/qpid/sys/epoll/EpollPoller.cpp index 67783fc8c8..8936251f94 100644 --- a/cpp/src/qpid/sys/epoll/EpollPoller.cpp +++ b/cpp/src/qpid/sys/epoll/EpollPoller.cpp @@ -166,7 +166,7 @@ class PollerPrivate { case ::EPOLLOUT: return Poller::WRITABLE; case ::EPOLLIN | ::EPOLLOUT: return Poller::READ_WRITABLE; default: - return (events & ::EPOLLHUP | ::EPOLLERR) ? + return (events & (::EPOLLHUP | ::EPOLLERR)) ? Poller::DISCONNECTED : Poller::INVALID; } } diff --git a/cpp/src/qpid/sys/posix/Socket.cpp b/cpp/src/qpid/sys/posix/Socket.cpp index 028b45d03d..c286ebce27 100644 --- a/cpp/src/qpid/sys/posix/Socket.cpp +++ b/cpp/src/qpid/sys/posix/Socket.cpp @@ -31,6 +31,7 @@ #include <netinet/in.h> #include <netdb.h> #include <cstdlib> +#include <string.h> #include <boost/format.hpp> @@ -160,7 +161,7 @@ void Socket::connect(const std::string& host, int port) const struct hostent* hp = gethostbyname ( host.c_str() ); if (hp == 0) throw Exception(QPID_MSG("Cannot resolve " << host << ": " << h_errstr(h_errno))); - memcpy(&name.sin_addr.s_addr, hp->h_addr_list[0], hp->h_length); + ::memcpy(&name.sin_addr.s_addr, hp->h_addr_list[0], hp->h_length); if (::connect(socket, (struct sockaddr*)(&name), sizeof(name)) < 0) throw qpid::Exception(QPID_MSG(strError(errno) << ": " << host << ":" << port)); } @@ -260,12 +261,12 @@ std::string Socket::getLocalAddress() const return impl->getName(true, true); } -uint Socket::getLocalPort() const +uint16_t Socket::getLocalPort() const { return atoi(impl->getService(true).c_str()); } -uint Socket::getRemotePort() const +uint16_t Socket::getRemotePort() const { return atoi(impl->getService(true).c_str()); } |