summaryrefslogtreecommitdiff
path: root/qpid/cpp
diff options
context:
space:
mode:
Diffstat (limited to 'qpid/cpp')
-rw-r--r--qpid/cpp/configure.ac4
-rw-r--r--qpid/cpp/src/qpid/cluster/UpdateClient.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/qpid/cpp/configure.ac b/qpid/cpp/configure.ac
index 4fe143bedf..009ff9d4f0 100644
--- a/qpid/cpp/configure.ac
+++ b/qpid/cpp/configure.ac
@@ -172,8 +172,8 @@ AC_ARG_WITH([cpg],
[AS_HELP_STRING([--with-cpg], [Build with CPG support for clustering.])],
[case "${withval}" in
yes) # yes - require dependencies
- test x$have_libcpg = xyes || AC_MSG_ERROR([libcpg not found, install openais-devel or corosync-devel])
- test x$have_cpg_h = xyes || AC_MSG_ERROR([cpg.h not found, install openais-devel or corosync-devel])
+ test x$have_libcpg = xyes || AC_MSG_ERROR([libcpg not found, install openais-devel and corosync-devel])
+ test x$have_cpg_h = xyes || AC_MSG_ERROR([cpg.h not found, install openais-devel and corosync-devel])
with_cpg=yes
;;
no) with_cpg=no ;;
diff --git a/qpid/cpp/src/qpid/cluster/UpdateClient.cpp b/qpid/cpp/src/qpid/cluster/UpdateClient.cpp
index 2ed0b26a0d..08f09573a4 100644
--- a/qpid/cpp/src/qpid/cluster/UpdateClient.cpp
+++ b/qpid/cpp/src/qpid/cluster/UpdateClient.cpp
@@ -99,8 +99,8 @@ UpdateClient::UpdateClient(const MemberId& updater, const MemberId& updatee, con
UpdateClient::~UpdateClient() {}
-// Illegal exchange/queue name for catch-up, avoid clashes with user queues/exchanges.
-static const char UPDATE_CHARS[] = "\000qpid-update";
+// Reserved exchange/queue name for catch-up, avoid clashes with user queues/exchanges.
+static const char UPDATE_CHARS[] = "qpid.qpid-update";
const std::string UpdateClient::UPDATE(UPDATE_CHARS, sizeof(UPDATE_CHARS));
void UpdateClient::update() {