diff options
| author | Alan Conway <aconway@apache.org> | 2007-08-30 13:23:40 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2007-08-30 13:23:40 +0000 |
| commit | cfaa5d0d31a387cd0634b7498201d1620d905a46 (patch) | |
| tree | cd21b4398a844ad2c264a15984d821167365d1b2 /qpid/cpp | |
| parent | 94b0978c09b14308c25b7c5b02792c192b0c5521 (diff) | |
| download | qpid-python-cfaa5d0d31a387cd0634b7498201d1620d905a46.tar.gz | |
* configure.ac: Disabled cluster build temporarily while fixing build problems.
* src/qpid/framing/Handler.h: Add missing default constructor.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@571161 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp')
| -rw-r--r-- | qpid/cpp/configure.ac | 4 | ||||
| -rw-r--r-- | qpid/cpp/src/qpid/framing/Handler.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/qpid/cpp/configure.ac b/qpid/cpp/configure.ac index 4ba175a71c..6440b2ee09 100644 --- a/qpid/cpp/configure.ac +++ b/qpid/cpp/configure.ac @@ -142,6 +142,10 @@ AC_CHECK_LIB([cpg],[cpg_local_get],[cpg_lib=yes],[cpg_lib=no]) AC_CHECK_HEADER([openais/cpg.h],[cpg_h=yes]) test x$cpg_lib = xyes -a x$cpg_h = xyes && enable_CLUSTER=yes +# FIXME aconway 2007-08-30: Disable cluster till build problems +# are fixed +enable_CLUSTER=no + if test x$enable_CLUSTER = xyes; then AC_ARG_ENABLE([cluster], [AS_HELP_STRING([--disable-cluster], diff --git a/qpid/cpp/src/qpid/framing/Handler.h b/qpid/cpp/src/qpid/framing/Handler.h index be49570f9b..3129e7d60e 100644 --- a/qpid/cpp/src/qpid/framing/Handler.h +++ b/qpid/cpp/src/qpid/framing/Handler.h @@ -47,7 +47,7 @@ struct Handler { * linked list of handlers. */ struct Chain : public Handler<T> { - Chain(Handler<T>* first) : Handler(first) {} + Chain(Handler<T>* first=0) : Handler(first) {} void operator=(Handler<T>* h) { next = h; } void handle(T t) { (*next)(t); } // TODO aconway 2007-08-29: chain modifier ops here. |