diff options
Diffstat (limited to 'qpid/cpp')
| -rw-r--r-- | qpid/cpp/README | 25 | ||||
| -rw-r--r-- | qpid/cpp/configure.ac | 2 | ||||
| -rw-r--r-- | qpid/cpp/src/qpid/cluster/ClassifierHandler.cpp | 2 | ||||
| -rw-r--r-- | qpid/cpp/src/qpid/cluster/SessionManager.cpp | 2 | ||||
| -rw-r--r-- | qpid/cpp/src/tests/Cluster.cpp | 1 |
5 files changed, 12 insertions, 20 deletions
diff --git a/qpid/cpp/README b/qpid/cpp/README index 5361d8aa61..c4cc67f133 100644 --- a/qpid/cpp/README +++ b/qpid/cpp/README @@ -31,24 +31,18 @@ Redhat Linux 3, will almost certainly require some packages to be upgraded. The following libraries and header files must be installed to build a source distribution: - * boost <http://www.boost.org> (1.33.1) - * uuid <http://e2fsprogs.sourceforge.net/> (1.39) + * boost <http://www.boost.org> (1.33.1) + * e2fsprogs <http://e2fsprogs.sourceforge.net/> (1.39) * pkgconfig <http://pkgconfig.freedesktop.org/wiki/> (0.21) -Building on a platform other than Linux currently requires: - * apr <http://apr.apache.org> (1.2.7) - Optional cluster functionality requires: - * openais <http://openais.org/> (0.80.3) - - * apr <http://apr.apache.org> (1.2.7) - * boost <http://www.boost.org> (1.33.1) - * cppunit <http://cppunit.sourceforge.net> (1.11.4) + * openais <http://openais.org/> (0.80.3) -Using tools: +Running qpid test suite requires: + * cppunit <http://cppunit.sourceforge.net> (1.11.4) -Qpid has been built using the gcc compiler: - * gcc <http://gcc.gnu.org/> (3.2.3) +Qpid has been built using the GNU C++ compiler: + * gcc <http://gcc.gnu.org/> (3.2.3) If you want to build directly from the SVN repository you will need all of the above plus: @@ -66,9 +60,8 @@ all of the above plus: On linux most packages can be installed using your distribution's package management tool. For example on Fedora: - - # yum install apr-devel boost-devel cppunit-devel - # yum install pkgconfig doxygen graphviz help2man + # yum install pkgconfig e2fsprogs boost-devel cppunit-devel openais + # yum install make gcc-c++ autoconf automake libtool doxygen help2man graphviz Follow the manual installation instruction below for any packages not available through yum. diff --git a/qpid/cpp/configure.ac b/qpid/cpp/configure.ac index 75330f8ca5..433bcd372f 100644 --- a/qpid/cpp/configure.ac +++ b/qpid/cpp/configure.ac @@ -177,5 +177,3 @@ AC_CONFIG_FILES([ ]) AC_OUTPUT -# Ensure Makefiles will be rebuilt when make first runs. -touch src/rubygen.mk src/generate.mk diff --git a/qpid/cpp/src/qpid/cluster/ClassifierHandler.cpp b/qpid/cpp/src/qpid/cluster/ClassifierHandler.cpp index 9410a3cc38..fc7765eef6 100644 --- a/qpid/cpp/src/qpid/cluster/ClassifierHandler.cpp +++ b/qpid/cpp/src/qpid/cluster/ClassifierHandler.cpp @@ -36,7 +36,7 @@ typedef uint32_t FullMethodId; // Combind class & method ID. FullMethodId fullId(ClassId c, MethodId m) { return c<<16+m; } -FullMethodId fullId(const AMQMethodBody*& body) { +FullMethodId fullId(const AMQMethodBody* body) { return fullId(body->amqpClassId(), body->amqpMethodId()); } diff --git a/qpid/cpp/src/qpid/cluster/SessionManager.cpp b/qpid/cpp/src/qpid/cluster/SessionManager.cpp index b8290ad953..44c5ff24c5 100644 --- a/qpid/cpp/src/qpid/cluster/SessionManager.cpp +++ b/qpid/cpp/src/qpid/cluster/SessionManager.cpp @@ -55,7 +55,7 @@ struct BrokerHandler : public FrameHandler, private ChannelAdapter, private Deli adapter(channel, connection, broker, *this) {} void handle(AMQFrame& frame) { - AMQMethodBody* body=dynamic_cast<AMQMethodBody*>(frame.body.get()); + AMQMethodBody* body=dynamic_cast<AMQMethodBody*>(frame.getBody()); assert(body); body->invoke(adapter); } diff --git a/qpid/cpp/src/tests/Cluster.cpp b/qpid/cpp/src/tests/Cluster.cpp index 2d23b87627..f3a50e2094 100644 --- a/qpid/cpp/src/tests/Cluster.cpp +++ b/qpid/cpp/src/tests/Cluster.cpp @@ -21,6 +21,7 @@ #include "qpid/framing/SessionPingBody.h" #include "qpid/framing/SessionPongBody.h" +#include "qpid/framing/all_method_bodies.h" #include "qpid/cluster/ClassifierHandler.h" #define BOOST_AUTO_TEST_MAIN // Must come before #include<boost/test/*> |