You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kg...@apache.org on 2015/06/15 16:17:01 UTC
svn commit: r1685587 - in /qpid/trunk/qpid/cpp/src: amqp.cmake
config.h.cmake qpid/broker/amqp/Connection.cpp
qpid/messaging/amqp/ConnectionContext.cpp
Author: kgiusti
Date: Mon Jun 15 14:17:00 2015
New Revision: 1685587
URL: http://svn.apache.org/r1685587
Log:
QPID-6568: bump the minimum supported proton to 0.7
Modified:
qpid/trunk/qpid/cpp/src/amqp.cmake
qpid/trunk/qpid/cpp/src/config.h.cmake
qpid/trunk/qpid/cpp/src/qpid/broker/amqp/Connection.cpp
qpid/trunk/qpid/cpp/src/qpid/messaging/amqp/ConnectionContext.cpp
Modified: qpid/trunk/qpid/cpp/src/amqp.cmake
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/amqp.cmake?rev=1685587&r1=1685586&r2=1685587&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/amqp.cmake (original)
+++ qpid/trunk/qpid/cpp/src/amqp.cmake Mon Jun 15 14:17:00 2015
@@ -19,7 +19,7 @@
# Optional AMQP1.0 support. Requires proton toolkit.
-find_package(Proton 0.5)
+find_package(Proton 0.7)
set (amqp_default ${amqp_force})
set (maximum_version 0.9)
@@ -29,10 +29,6 @@ if (Proton_FOUND)
endif (Proton_VERSION VERSION_GREATER ${maximum_version})
message(STATUS "Qpid proton found, amqp 1.0 support enabled")
set (amqp_default ON)
- #remove when 0.5 no longer supported
- if (NOT Proton_VERSION EQUAL 0.5)
- set (HAVE_PROTON_TRACER 1)
- endif (NOT Proton_VERSION EQUAL 0.5)
if (Proton_VERSION VERSION_GREATER 0.7)
set (USE_PROTON_TRANSPORT_CONDITION 1)
set (HAVE_PROTON_EVENTS 1)
Modified: qpid/trunk/qpid/cpp/src/config.h.cmake
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/config.h.cmake?rev=1685587&r1=1685586&r2=1685587&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/config.h.cmake (original)
+++ qpid/trunk/qpid/cpp/src/config.h.cmake Mon Jun 15 14:17:00 2015
@@ -57,7 +57,6 @@
#cmakedefine HAVE_LOG_AUTHPRIV
#cmakedefine HAVE_LOG_FTP
#cmakedefine QPID_SIZE_T_DISTINCT
-#cmakedefine HAVE_PROTON_TRACER
#cmakedefine USE_PROTON_TRANSPORT_CONDITION
#cmakedefine HAVE_PROTON_EVENTS
#cmakedefine NO_PROTON_DELIVERY_TAG_T
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/amqp/Connection.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/amqp/Connection.cpp?rev=1685587&r1=1685586&r2=1685587&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/amqp/Connection.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/amqp/Connection.cpp Mon Jun 15 14:17:00 2015
@@ -46,8 +46,7 @@ namespace qpid {
namespace broker {
namespace amqp {
namespace {
-//remove conditional when 0.5 is no longer supported
-#ifdef HAVE_PROTON_TRACER
+
void do_trace(pn_transport_t* transport, const char* message)
{
Connection* c = reinterpret_cast<Connection*>(pn_transport_get_context(transport));
@@ -59,11 +58,6 @@ void set_tracer(pn_transport_t* transpor
pn_transport_set_context(transport, context);
pn_transport_set_tracer(transport, &do_trace);
}
-#else
-void set_tracer(pn_transport_t*, void*)
-{
-}
-#endif
#ifdef USE_PROTON_TRANSPORT_CONDITION
std::string get_error(pn_connection_t* connection, pn_transport_t* transport)
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=1685587&r1=1685586&r2=1685587&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/messaging/amqp/ConnectionContext.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/messaging/amqp/ConnectionContext.cpp Mon Jun 15 14:17:00 2015
@@ -59,8 +59,7 @@ namespace amqp {
using types::Variant;
namespace {
-//remove conditional when 0.5 is no longer supported
-#ifdef HAVE_PROTON_TRACER
+
void do_trace(pn_transport_t* transport, const char* message)
{
ConnectionContext* c = reinterpret_cast<ConnectionContext*>(pn_transport_get_context(transport));
@@ -72,11 +71,6 @@ void set_tracer(pn_transport_t* transpor
pn_transport_set_context(transport, context);
pn_transport_set_tracer(transport, &do_trace);
}
-#else
-void set_tracer(pn_transport_t*, void*)
-{
-}
-#endif
#ifdef USE_PROTON_TRANSPORT_CONDITION
std::string get_error(pn_connection_t* connection, pn_transport_t* transport)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org