You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by as...@apache.org on 2016/03/16 23:36:28 UTC
svn commit: r1735325 - in /qpid/trunk/qpid/cpp/src/qpid/sys/rdma:
RdmaClient.cpp RdmaServer.cpp
Author: astitcher
Date: Wed Mar 16 22:36:28 2016
New Revision: 1735325
URL: http://svn.apache.org/viewvc?rev=1735325&view=rev
Log:
QPID-7146: Fix function binding error
Modified:
qpid/trunk/qpid/cpp/src/qpid/sys/rdma/RdmaClient.cpp
qpid/trunk/qpid/cpp/src/qpid/sys/rdma/RdmaServer.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/sys/rdma/RdmaClient.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/rdma/RdmaClient.cpp?rev=1735325&r1=1735324&r2=1735325&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/rdma/RdmaClient.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/rdma/RdmaClient.cpp Wed Mar 16 22:36:28 2016
@@ -160,7 +160,7 @@ void drained(Rdma::AsynchIO&) {
cout << "Drained:\n";
}
-void connected(Poller::shared_ptr poller, Rdma::Connection::intrusive_ptr& ci, const Rdma::ConnectionParams& cp) {
+void connected(Poller::shared_ptr poller, const Rdma::Connection::intrusive_ptr& ci, const Rdma::ConnectionParams& cp) {
cout << "Connected\n";
Rdma::QueuePair::intrusive_ptr q = ci->getQueuePair();
@@ -178,17 +178,17 @@ void connected(Poller::shared_ptr poller
aio->start(poller);
}
-void disconnected(boost::shared_ptr<Poller> p, Rdma::Connection::intrusive_ptr&) {
+void disconnected(boost::shared_ptr<Poller> p, const Rdma::Connection::intrusive_ptr&) {
cout << "Disconnected\n";
p->shutdown();
}
-void connectionError(boost::shared_ptr<Poller> p, Rdma::Connection::intrusive_ptr&, const Rdma::ErrorType) {
+void connectionError(boost::shared_ptr<Poller> p, const Rdma::Connection::intrusive_ptr&, const Rdma::ErrorType) {
cout << "Connection error\n";
p->shutdown();
}
-void rejected(boost::shared_ptr<Poller> p, Rdma::Connection::intrusive_ptr&, const Rdma::ConnectionParams&) {
+void rejected(boost::shared_ptr<Poller> p, const Rdma::Connection::intrusive_ptr&, const Rdma::ConnectionParams&) {
cout << "Connection rejected\n";
p->shutdown();
}
Modified: qpid/trunk/qpid/cpp/src/qpid/sys/rdma/RdmaServer.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/rdma/RdmaServer.cpp?rev=1735325&r1=1735324&r2=1735325&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/rdma/RdmaServer.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/rdma/RdmaServer.cpp Wed Mar 16 22:36:28 2016
@@ -119,7 +119,7 @@ void drained(Rdma::AsynchIO&) {
cout << "Drained:\n";
}
-void disconnected(Rdma::Connection::intrusive_ptr& ci) {
+void disconnected(const Rdma::Connection::intrusive_ptr& ci) {
ConRec* cr = ci->getContext<ConRec>();
cr->connection->disconnect();
cr->data->drainWriteQueue(drained);
@@ -127,7 +127,7 @@ void disconnected(Rdma::Connection::intr
cout << "Disconnected: " << cr << "\n";
}
-void connectionError(Rdma::Connection::intrusive_ptr& ci, Rdma::ErrorType) {
+void connectionError(const Rdma::Connection::intrusive_ptr& ci, Rdma::ErrorType) {
ConRec* cr = ci->getContext<ConRec>();
cr->connection->disconnect();
if (cr) {
@@ -137,7 +137,7 @@ void connectionError(Rdma::Connection::i
cout << "Connection error: " << cr << "\n";
}
-bool connectionRequest(Rdma::Connection::intrusive_ptr& ci, const Rdma::ConnectionParams& cp) {
+bool connectionRequest(const Rdma::Connection::intrusive_ptr& ci, const Rdma::ConnectionParams& cp) {
cout << "Incoming connection: ";
// For fun reject alternate connection attempts
@@ -165,7 +165,7 @@ bool connectionRequest(Rdma::Connection:
return x;
}
-void connected(Poller::shared_ptr poller, Rdma::Connection::intrusive_ptr& ci) {
+void connected(Poller::shared_ptr poller, const Rdma::Connection::intrusive_ptr& ci) {
static int cnt = 0;
ConRec* cr = ci->getContext<ConRec>();
cout << "Connected: " << cr << "(" << ++cnt << ")\n";
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org