Return-Path: 
 <commits-return-28415-apmail-qpid-commits-archive=qpid.apache.org@qpid.apache.org>
X-Original-To: apmail-qpid-commits-archive@www.apache.org
Delivered-To: apmail-qpid-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 4692A10E71
	for <apmail-qpid-commits-archive@www.apache.org>;
 Thu,  5 Mar 2015 22:32:02 +0000 (UTC)
Received: (qmail 1082 invoked by uid 500); 5 Mar 2015 22:32:02 -0000
Delivered-To: apmail-qpid-commits-archive@qpid.apache.org
Received: (qmail 1067 invoked by uid 500); 5 Mar 2015 22:32:01 -0000
Mailing-List: contact commits-help@qpid.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@qpid.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@qpid.apache.org>
List-Post: <mailto:commits@qpid.apache.org>
List-Id: <commits.qpid.apache.org>
Reply-To: dev@qpid.apache.org
Delivered-To: mailing list commits@qpid.apache.org
Received: (qmail 1058 invoked by uid 99); 5 Mar 2015 22:32:01 -0000
Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Mar 2015 22:32:01 +0000
Received: from hades.apache.org (localhost [127.0.0.1])
	by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id
 A03C7AC039A
	for <commits@qpid.apache.org>; Thu,  5 Mar 2015 22:32:01 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1664517 - in /qpid/trunk/qpid/cpp/src/qpid:
 broker/amqp/Session.cpp messaging/amqp/ConnectionContext.cpp
 messaging/amqp/ReceiverContext.h messaging/amqp/SenderContext.h
Date: Thu, 05 Mar 2015 22:32:01 -0000
To: commits@qpid.apache.org
From: aconway@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20150305223201.A03C7AC039A@hades.apache.org>

Author: aconway
Date: Thu Mar  5 22:32:00 2015
New Revision: 1664517

URL: http://svn.apache.org/r1664517
Log:
QPID-6427: Problem building trunk qpid cpp on RHEL 5

Fixed a couple of legitimate compiler warnings, worked around a couple of compiler weaknesses.

Modified:
    qpid/trunk/qpid/cpp/src/qpid/broker/amqp/Session.cpp
    qpid/trunk/qpid/cpp/src/qpid/messaging/amqp/ConnectionContext.cpp
    qpid/trunk/qpid/cpp/src/qpid/messaging/amqp/ReceiverContext.h
    qpid/trunk/qpid/cpp/src/qpid/messaging/amqp/SenderContext.h

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/amqp/Session.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/amqp/Session.cpp?rev=1664517&r1=1664516&r2=1664517&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/amqp/Session.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/amqp/Session.cpp Thu Mar  5 22:32:00 2015
@@ -835,7 +835,7 @@ void Session::abort()
         tx.dischargeComplete();
         tx.buffer->rollback();
         txAborted();
-        tx.buffer.reset();
+        tx.buffer = boost::intrusive_ptr<TxBuffer>();
         QPID_LOG(debug, "Transaction " << tx.id << " rolled back");
     }
 }
@@ -848,7 +848,7 @@ void Session::committed(bool sync)
         if (tx.buffer.get()) {
             tx.buffer->endCommit(&connection.getBroker().getStore());
             txCommitted();
-            tx.buffer.reset();
+	    tx.buffer = boost::intrusive_ptr<TxBuffer>();
             QPID_LOG(debug, "Transaction " << tx.id << " comitted");
         } else {
             throw Exception(qpid::amqp::error_conditions::transaction::ROLLBACK, "tranaction vanished during async commit");

Modified: qpid/trunk/qpid/cpp/src/qpid/messaging/amqp/ConnectionContext.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/messaging/amqp/ConnectionContext.cpp?rev=1664517&r1=1664516&r2=1664517&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/messaging/amqp/ConnectionContext.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/messaging/amqp/ConnectionContext.cpp Thu Mar  5 22:32:00 2015
@@ -230,7 +230,7 @@ void ConnectionContext::close()
     }
     if (ticker) {
         ticker->cancel();
-        ticker.reset();
+        ticker = boost::intrusive_ptr<qpid::sys::TimerTask>();
     }
 }
 
@@ -1236,7 +1236,7 @@ void ConnectionContext::startTxSession(b
         QPID_LOG(debug, id << " attaching transaction for " << session->getName());
         boost::shared_ptr<Transaction> tx(new Transaction(session->session));
         session->transaction = tx;
-        attach(session, tx);
+        attach(session, boost::shared_ptr<SenderContext>(tx));
         tx->declare(boost::bind(&ConnectionContext::send, this, _1, _2, _3, _4, _5), session);
     } catch (const Exception& e) {
         throw TransactionError(Msg() << "Cannot start transaction: " << e.what());

Modified: qpid/trunk/qpid/cpp/src/qpid/messaging/amqp/ReceiverContext.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/messaging/amqp/ReceiverContext.h?rev=1664517&r1=1664516&r2=1664517&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/messaging/amqp/ReceiverContext.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/messaging/amqp/ReceiverContext.h Thu Mar  5 22:32:00 2015
@@ -46,7 +46,7 @@ class ReceiverContext
 {
   public:
     ReceiverContext(pn_session_t* session, const std::string& name, const qpid::messaging::Address& source);
-    ~ReceiverContext();
+    virtual ~ReceiverContext();
     void reset(pn_session_t* session);
     void setCapacity(uint32_t);
     uint32_t getCapacity();

Modified: qpid/trunk/qpid/cpp/src/qpid/messaging/amqp/SenderContext.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/messaging/amqp/SenderContext.h?rev=1664517&r1=1664516&r2=1664517&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/messaging/amqp/SenderContext.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/messaging/amqp/SenderContext.h Thu Mar  5 22:32:00 2015
@@ -76,7 +76,7 @@ class SenderContext
                   const qpid::messaging::Address& target,
                   bool setToOnSend,
                   const CoordinatorPtr& transaction = CoordinatorPtr());
-    ~SenderContext();
+    virtual ~SenderContext();
 
     virtual void reset(pn_session_t* session);
     virtual void close();



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org