diff options
| author | Nuno Santos <nsantos@apache.org> | 2012-02-17 20:54:48 +0000 |
|---|---|---|
| committer | Nuno Santos <nsantos@apache.org> | 2012-02-17 20:54:48 +0000 |
| commit | 11dcc275fe05f0db9f60e20de42ee36d2985b632 (patch) | |
| tree | ee7b376163a5b4cb34b4c00f33dc59306c4c2eda /qpid/cpp/src | |
| parent | 911fb772ffc52cccd86106cbc075157a064e1495 (diff) | |
| download | qpid-python-11dcc275fe05f0db9f60e20de42ee36d2985b632.tar.gz | |
more fixes for compilation under fedora 18, new gcc
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1245757 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
| -rw-r--r-- | qpid/cpp/src/qmf/Hash.h | 2 | ||||
| -rw-r--r-- | qpid/cpp/src/qpid/sys/Shlib.h | 1 | ||||
| -rwxr-xr-x | qpid/cpp/src/qpid/sys/posix/SystemInfo.cpp | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/qpid/cpp/src/qmf/Hash.h b/qpid/cpp/src/qmf/Hash.h index e1eff84117..4bd76832aa 100644 --- a/qpid/cpp/src/qmf/Hash.h +++ b/qpid/cpp/src/qmf/Hash.h @@ -29,7 +29,7 @@ namespace qmf { class Hash { public: Hash(); - qpid::types::Uuid asUuid() const { return qpid::types::Uuid((unsigned char*) data); } + qpid::types::Uuid asUuid() const { return qpid::types::Uuid((const unsigned char*) data); } void update(const char* s, uint32_t len); void update(uint8_t v) { update((char*) &v, sizeof(v)); } void update(uint32_t v) { update((char*) &v, sizeof(v)); } diff --git a/qpid/cpp/src/qpid/sys/Shlib.h b/qpid/cpp/src/qpid/sys/Shlib.h index 7f66cfec14..2ce5a49fcb 100644 --- a/qpid/cpp/src/qpid/sys/Shlib.h +++ b/qpid/cpp/src/qpid/sys/Shlib.h @@ -23,6 +23,7 @@ */ #include "qpid/CommonImportExport.h" +#include "qpid/sys/IntegerTypes.h" #include <boost/noncopyable.hpp> #include <iostream> diff --git a/qpid/cpp/src/qpid/sys/posix/SystemInfo.cpp b/qpid/cpp/src/qpid/sys/posix/SystemInfo.cpp index a19ab6885c..540cc8bc91 100755 --- a/qpid/cpp/src/qpid/sys/posix/SystemInfo.cpp +++ b/qpid/cpp/src/qpid/sys/posix/SystemInfo.cpp @@ -28,6 +28,7 @@ #include <sys/socket.h> // For FreeBSD #include <netinet/in.h> // For FreeBSD #include <ifaddrs.h> +#include <unistd.h> #include <iostream> #include <fstream> #include <sstream> |