Author: aconway
Date: Fri Aug 17 12:04:14 2007
New Revision: 567109
URL: http://svn.apache.org/viewvc?view=rev&rev=567109
Log:
Fix cluster code for heap reuduction commit.
Modified:
incubator/qpid/trunk/qpid/cpp/README
incubator/qpid/trunk/qpid/cpp/configure.ac
incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/ClassifierHandler.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/SessionManager.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/Cluster.cpp
Modified: incubator/qpid/trunk/qpid/cpp/README
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/README?view=diff&rev=567109&r1=567108&r2=567109
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/README (original)
+++ incubator/qpid/trunk/qpid/cpp/README Fri Aug 17 12:04:14 2007
@@ -31,24 +31,18 @@
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 @@
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.
Modified: incubator/qpid/trunk/qpid/cpp/configure.ac
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/configure.ac?view=diff&rev=567109&r1=567108&r2=567109
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/configure.ac (original)
+++ incubator/qpid/trunk/qpid/cpp/configure.ac Fri Aug 17 12:04:14 2007
@@ -177,5 +177,3 @@
])
AC_OUTPUT
-# Ensure Makefiles will be rebuilt when make first runs.
-touch src/rubygen.mk src/generate.mk
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/ClassifierHandler.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/ClassifierHandler.cpp?view=diff&rev=567109&r1=567108&r2=567109
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/ClassifierHandler.cpp
(original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/ClassifierHandler.cpp Fri
Aug 17 12:04:14 2007
@@ -36,7 +36,7 @@
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());
}
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/SessionManager.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/SessionManager.cpp?view=diff&rev=567109&r1=567108&r2=567109
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/SessionManager.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/SessionManager.cpp Fri Aug
17 12:04:14 2007
@@ -55,7 +55,7 @@
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);
}
Modified: incubator/qpid/trunk/qpid/cpp/src/tests/Cluster.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/Cluster.cpp?view=diff&rev=567109&r1=567108&r2=567109
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/Cluster.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/Cluster.cpp Fri Aug 17 12:04:14 2007
@@ -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/*>
