From 9c73ef7a5ac10acd6a50d5d52bd721fc2faa5919 Mon Sep 17 00:00:00 2001 From: Kim van der Riet Date: Thu, 28 Feb 2013 16:14:30 +0000 Subject: Update from trunk r1375509 through r1450773 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/asyncstore@1451244 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/include/qpid/client/ConnectionSettings.h | 6 ++++++ cpp/include/qpid/client/FailoverManager.h | 1 + 2 files changed, 7 insertions(+) (limited to 'cpp/include/qpid/client') diff --git a/cpp/include/qpid/client/ConnectionSettings.h b/cpp/include/qpid/client/ConnectionSettings.h index 2b6b86f891..a0c209badf 100644 --- a/cpp/include/qpid/client/ConnectionSettings.h +++ b/cpp/include/qpid/client/ConnectionSettings.h @@ -23,6 +23,7 @@ */ #include "qpid/client/ClientImportExport.h" +#include "qpid/framing/FieldTable.h" #include "qpid/sys/IntegerTypes.h" #include @@ -127,6 +128,11 @@ struct QPID_CLIENT_CLASS_EXTERN ConnectionSettings { * settings. Used only when a client connects to the broker. */ std::string sslCertName; + + /** + * Passed as client-propreties on opening the connecction. + */ + framing::FieldTable clientProperties; }; }} // namespace qpid::client diff --git a/cpp/include/qpid/client/FailoverManager.h b/cpp/include/qpid/client/FailoverManager.h index d3a0dbc976..bc739fd0f5 100644 --- a/cpp/include/qpid/client/FailoverManager.h +++ b/cpp/include/qpid/client/FailoverManager.h @@ -87,6 +87,7 @@ class QPID_CLIENT_CLASS_EXTERN FailoverManager * attempted */ QPID_CLIENT_EXTERN FailoverManager(const ConnectionSettings& settings, ReconnectionStrategy* strategy = 0); + QPID_CLIENT_EXTERN ~FailoverManager(); /** * Return the current connection if open or attept to reconnect to * the specified list of urls. If no list is specified the list of -- cgit v1.2.1