summaryrefslogtreecommitdiff
path: root/cpp/include/qpid/messaging/Connection.h
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/include/qpid/messaging/Connection.h')
-rw-r--r--cpp/include/qpid/messaging/Connection.h14
1 files changed, 5 insertions, 9 deletions
diff --git a/cpp/include/qpid/messaging/Connection.h b/cpp/include/qpid/messaging/Connection.h
index e58abc1986..23711034d6 100644
--- a/cpp/include/qpid/messaging/Connection.h
+++ b/cpp/include/qpid/messaging/Connection.h
@@ -24,6 +24,7 @@
#include <string>
#include "qpid/messaging/ImportExport.h"
#include "qpid/messaging/Handle.h"
+#include "qpid/messaging/exceptions.h"
#include "qpid/types/Variant.h"
namespace qpid {
@@ -33,11 +34,6 @@ template <class> class PrivateImplRef;
class ConnectionImpl;
class Session;
-struct InvalidOptionString : public qpid::Exception
-{
- InvalidOptionString(const std::string& msg);
-};
-
class Connection : public qpid::messaging::Handle<ConnectionImpl>
{
public:
@@ -51,6 +47,7 @@ class Connection : public qpid::messaging::Handle<ConnectionImpl>
* heartbeat
* tcp-nodelay
* sasl-mechanism
+ * sasl-service
* sasl-min-ssf
* sasl-max-ssf
* transport
@@ -78,13 +75,12 @@ class Connection : public qpid::messaging::Handle<ConnectionImpl>
*
* @exception InvalidOptionString if the string does not match the correct syntax
*/
- QPID_CLIENT_EXTERN Connection(const std::string& url, const std::string& options);
+ QPID_CLIENT_EXTERN Connection(const std::string& url, const std::string& options) throw(InvalidOptionString);
QPID_CLIENT_EXTERN ~Connection();
QPID_CLIENT_EXTERN Connection& operator=(const Connection&);
QPID_CLIENT_EXTERN void setOption(const std::string& name, const qpid::types::Variant& value);
- QPID_CLIENT_EXTERN void connect();
- QPID_CLIENT_EXTERN bool isConnected();
- QPID_CLIENT_EXTERN void detach();
+ QPID_CLIENT_EXTERN void open();
+ QPID_CLIENT_EXTERN bool isOpen();
/**
* Closes a connection and all sessions associated with it. An
* opened connection must be closed before the last handle is