diff options
| author | Nuno Santos <nsantos@apache.org> | 2012-02-16 21:43:35 +0000 |
|---|---|---|
| committer | Nuno Santos <nsantos@apache.org> | 2012-02-16 21:43:35 +0000 |
| commit | ed0055e2ac5db1b52ef8ccd7ac21eb04f78c44ae (patch) | |
| tree | 9abdefefffc38089a348f1652e28e7a54680bd0a /qpid/cpp | |
| parent | 0dcc6ac33b4ed30ab991d1ced115e7990ad44e0d (diff) | |
| download | qpid-python-ed0055e2ac5db1b52ef8ccd7ac21eb04f78c44ae.tar.gz | |
missing casts and include to be able to compile under fedora 18
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1245195 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp')
| -rw-r--r-- | qpid/cpp/src/qpid/sys/posix/Socket.cpp | 1 | ||||
| -rw-r--r-- | qpid/cpp/src/qpid/sys/posix/SocketAddress.cpp | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/qpid/cpp/src/qpid/sys/posix/Socket.cpp b/qpid/cpp/src/qpid/sys/posix/Socket.cpp index 4a6dc66f80..77ae1af60c 100644 --- a/qpid/cpp/src/qpid/sys/posix/Socket.cpp +++ b/qpid/cpp/src/qpid/sys/posix/Socket.cpp @@ -29,6 +29,7 @@ #include <sys/types.h> #include <sys/socket.h> #include <sys/errno.h> +#include <unistd.h> #include <netinet/in.h> #include <netinet/tcp.h> #include <netdb.h> diff --git a/qpid/cpp/src/qpid/sys/posix/SocketAddress.cpp b/qpid/cpp/src/qpid/sys/posix/SocketAddress.cpp index 6d5cf16b54..a7049c1851 100644 --- a/qpid/cpp/src/qpid/sys/posix/SocketAddress.cpp +++ b/qpid/cpp/src/qpid/sys/posix/SocketAddress.cpp @@ -84,8 +84,8 @@ std::string SocketAddress::asString(::sockaddr const * const addr, size_t addrle uint16_t SocketAddress::getPort(::sockaddr const * const addr) { switch (addr->sa_family) { - case AF_INET: return ntohs(((::sockaddr_in*)(void*)addr)->sin_port); - case AF_INET6: return ntohs(((::sockaddr_in6*)(void*)addr)->sin6_port); + case AF_INET: return ntohs(((const ::sockaddr_in*)(const void*)addr)->sin_port); + case AF_INET6: return ntohs(((const ::sockaddr_in6*)(const void*)addr)->sin6_port); default:throw Exception(QPID_MSG("Unexpected socket type")); } } |