summaryrefslogtreecommitdiff
path: root/cpp/src/qpid/broker/Bridge.cpp
diff options
context:
space:
mode:
authorGordon Sim <gsim@apache.org>2013-06-25 13:28:15 +0000
committerGordon Sim <gsim@apache.org>2013-06-25 13:28:15 +0000
commit35cb597c315b5bc3e17611cb40fe8492b0a4e45c (patch)
tree39d79c9ec301089de7b4471d23245f92bf10a0d1 /cpp/src/qpid/broker/Bridge.cpp
parent167069c6d6eb3ca2c5f997cbb16f296302160ad7 (diff)
downloadqpid-python-35cb597c315b5bc3e17611cb40fe8492b0a4e45c.tar.gz
QPID-4712: authorisation for AMQP 1.0 connections
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1496466 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/broker/Bridge.cpp')
-rw-r--r--cpp/src/qpid/broker/Bridge.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/qpid/broker/Bridge.cpp b/cpp/src/qpid/broker/Bridge.cpp
index 0c2655f507..6b34898158 100644
--- a/cpp/src/qpid/broker/Bridge.cpp
+++ b/cpp/src/qpid/broker/Bridge.cpp
@@ -22,7 +22,7 @@
#include "qpid/broker/Broker.h"
#include "qpid/broker/FedOps.h"
-#include "qpid/broker/Connection.h"
+#include "qpid/broker/amqp_0_10/Connection.h"
#include "qpid/broker/Link.h"
#include "qpid/broker/LinkRegistry.h"
#include "qpid/broker/SessionState.h"
@@ -100,7 +100,7 @@ Bridge::~Bridge()
mgmtObject->resourceDestroy();
}
-void Bridge::create(Connection& c)
+void Bridge::create(amqp_0_10::Connection& c)
{
detached = false; // Reset detached in case we are recovering.
conn = &c;
@@ -200,7 +200,7 @@ void Bridge::create(Connection& c)
if (args.i_srcIsLocal) sessionHandler.getSession()->enableReceiverTracking();
}
-void Bridge::cancel(Connection&)
+void Bridge::cancel(amqp_0_10::Connection&)
{
if (resetProxy()) {
peer->getMessage().cancel(args.i_dest);