diff options
Diffstat (limited to 'qpid/cpp')
-rw-r--r-- | qpid/cpp/src/amqp.cmake | 6 | ||||
-rw-r--r-- | qpid/cpp/src/config.h.cmake | 1 | ||||
-rw-r--r-- | qpid/cpp/src/qpid/broker/amqp/Connection.cpp | 8 | ||||
-rw-r--r-- | qpid/cpp/src/qpid/messaging/amqp/ConnectionContext.cpp | 8 |
4 files changed, 3 insertions, 20 deletions
diff --git a/qpid/cpp/src/amqp.cmake b/qpid/cpp/src/amqp.cmake index d6e52d62ae..9e2bf75ac4 100644 --- a/qpid/cpp/src/amqp.cmake +++ b/qpid/cpp/src/amqp.cmake @@ -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) diff --git a/qpid/cpp/src/config.h.cmake b/qpid/cpp/src/config.h.cmake index ffde86ffa5..1e1f4087ee 100644 --- a/qpid/cpp/src/config.h.cmake +++ b/qpid/cpp/src/config.h.cmake @@ -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 diff --git a/qpid/cpp/src/qpid/broker/amqp/Connection.cpp b/qpid/cpp/src/qpid/broker/amqp/Connection.cpp index c1c098923e..144f55780f 100644 --- a/qpid/cpp/src/qpid/broker/amqp/Connection.cpp +++ b/qpid/cpp/src/qpid/broker/amqp/Connection.cpp @@ -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* transport, void* context) 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) diff --git a/qpid/cpp/src/qpid/messaging/amqp/ConnectionContext.cpp b/qpid/cpp/src/qpid/messaging/amqp/ConnectionContext.cpp index 74b490bb5f..8947f5dce0 100644 --- a/qpid/cpp/src/qpid/messaging/amqp/ConnectionContext.cpp +++ b/qpid/cpp/src/qpid/messaging/amqp/ConnectionContext.cpp @@ -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* transport, void* context) 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) |