Repository: qpid-proton Updated Branches: refs/heads/master db2505752 -> d221b2744
NO-JIRA: fix compile error on older gcc for cd8ad96. Make object template explicit. Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/d221b274 Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/d221b274 Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/d221b274 Branch: refs/heads/master Commit: d221b2744232559a9b7aa05ebc0b912e54ea3894 Parents: db25057 Author: Clifford Jansen <[email protected]> Authored: Sat Nov 21 12:43:56 2015 -0800 Committer: Clifford Jansen <[email protected]> Committed: Sat Nov 21 12:43:56 2015 -0800 ---------------------------------------------------------------------- proton-c/bindings/cpp/include/proton/acceptor.hpp | 2 +- proton-c/bindings/cpp/include/proton/connection.hpp | 2 +- proton-c/bindings/cpp/include/proton/data.hpp | 4 ++-- proton-c/bindings/cpp/include/proton/decoder.hpp | 2 +- proton-c/bindings/cpp/include/proton/delivery.hpp | 2 +- proton-c/bindings/cpp/include/proton/encoder.hpp | 2 +- proton-c/bindings/cpp/include/proton/link.hpp | 2 +- proton-c/bindings/cpp/include/proton/reactor.hpp | 2 +- proton-c/bindings/cpp/include/proton/session.hpp | 2 +- proton-c/bindings/cpp/include/proton/task.hpp | 2 +- proton-c/bindings/cpp/include/proton/transport.hpp | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/d221b274/proton-c/bindings/cpp/include/proton/acceptor.hpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/include/proton/acceptor.hpp b/proton-c/bindings/cpp/include/proton/acceptor.hpp index c4fbdde..cd77358 100644 --- a/proton-c/bindings/cpp/include/proton/acceptor.hpp +++ b/proton-c/bindings/cpp/include/proton/acceptor.hpp @@ -34,7 +34,7 @@ namespace proton { class acceptor : public object<pn_acceptor_t> { public: - acceptor(pn_acceptor_t* a=0) : object(a) {} + acceptor(pn_acceptor_t* a=0) : object<pn_acceptor_t>(a) {} /** close the acceptor */ PN_CPP_EXTERN void close(); http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/d221b274/proton-c/bindings/cpp/include/proton/connection.hpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/include/proton/connection.hpp b/proton-c/bindings/cpp/include/proton/connection.hpp index e38148b..b662b9c 100644 --- a/proton-c/bindings/cpp/include/proton/connection.hpp +++ b/proton-c/bindings/cpp/include/proton/connection.hpp @@ -41,7 +41,7 @@ class engine; class connection : public object<pn_connection_t>, endpoint { public: - connection(pn_connection_t* c=0) : object(c) {} + connection(pn_connection_t* c=0) : object<pn_connection_t>(c) {} /// Get the connection context object from the connection PN_CPP_EXTERN connection_context& context() const; http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/d221b274/proton-c/bindings/cpp/include/proton/data.hpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/include/proton/data.hpp b/proton-c/bindings/cpp/include/proton/data.hpp index 9ac0e82..e74b77b 100644 --- a/proton-c/bindings/cpp/include/proton/data.hpp +++ b/proton-c/bindings/cpp/include/proton/data.hpp @@ -39,8 +39,8 @@ class data; */ class data : public object<pn_data_t> { public: - data(pn_data_t* d) : object(d) {} - data(owned_object<pn_data_t> d) : object(d) {} + data(pn_data_t* d) : object<pn_data_t>(d) {} + data(owned_object<pn_data_t> d) : object<pn_data_t>(d) {} PN_CPP_EXTERN static owned_object<pn_data_t> create(); http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/d221b274/proton-c/bindings/cpp/include/proton/decoder.hpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/include/proton/decoder.hpp b/proton-c/bindings/cpp/include/proton/decoder.hpp index 8f487bc..a4d9a11 100644 --- a/proton-c/bindings/cpp/include/proton/decoder.hpp +++ b/proton-c/bindings/cpp/include/proton/decoder.hpp @@ -150,7 +150,7 @@ You can also extract container values element-by-element, see decoder::operator> */ class decoder : public object<pn_data_t> { public: - decoder(pn_data_t* d) : object(d) {} + decoder(pn_data_t* d) : object<pn_data_t>(d) {} /** Copy AMQP data from a byte buffer into the decoder. */ PN_CPP_EXTERN decoder(const char* buffer, size_t size); http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/d221b274/proton-c/bindings/cpp/include/proton/delivery.hpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/include/proton/delivery.hpp b/proton-c/bindings/cpp/include/proton/delivery.hpp index da62082..a05347b 100644 --- a/proton-c/bindings/cpp/include/proton/delivery.hpp +++ b/proton-c/bindings/cpp/include/proton/delivery.hpp @@ -33,7 +33,7 @@ namespace proton { /** delivery status of a message */ class delivery : public object<pn_delivery_t> { public: - delivery(pn_delivery_t* d=0) : object(d) {} + delivery(pn_delivery_t* d=0) : object<pn_delivery_t>(d) {} /** Delivery state of a message */ enum state { http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/d221b274/proton-c/bindings/cpp/include/proton/encoder.hpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/include/proton/encoder.hpp b/proton-c/bindings/cpp/include/proton/encoder.hpp index a28ea26..c5eb064 100644 --- a/proton-c/bindings/cpp/include/proton/encoder.hpp +++ b/proton-c/bindings/cpp/include/proton/encoder.hpp @@ -91,7 +91,7 @@ struct encode_error : public error { PN_CPP_EXTERN explicit encode_error(const s */ class encoder : public object<pn_data_t> { public: - encoder(pn_data_t* e) : object(e) {} + encoder(pn_data_t* e) : object<pn_data_t>(e) {} /** * Encode the current values into buffer and update size to reflect the number of bytes encoded. http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/d221b274/proton-c/bindings/cpp/include/proton/link.hpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/include/proton/link.hpp b/proton-c/bindings/cpp/include/proton/link.hpp index d73156e..b775341 100644 --- a/proton-c/bindings/cpp/include/proton/link.hpp +++ b/proton-c/bindings/cpp/include/proton/link.hpp @@ -39,7 +39,7 @@ class receiver; class link : public object<pn_link_t> , public endpoint { public: - link(pn_link_t* l=0) : object(l) {} + link(pn_link_t* l=0) : object<pn_link_t>(l) {} /** Locally open the link, not complete till messaging_handler::on_link_opened or * proton_handler::link_remote_open http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/d221b274/proton-c/bindings/cpp/include/proton/reactor.hpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/include/proton/reactor.hpp b/proton-c/bindings/cpp/include/proton/reactor.hpp index a7aa671..929a24b 100644 --- a/proton-c/bindings/cpp/include/proton/reactor.hpp +++ b/proton-c/bindings/cpp/include/proton/reactor.hpp @@ -36,7 +36,7 @@ class task; class reactor : public object<pn_reactor_t> { public: - reactor(pn_reactor_t* r = 0) : object(r) {} + reactor(pn_reactor_t* r = 0) : object<pn_reactor_t>(r) {} /** Create a new reactor. */ PN_CPP_EXTERN static reactor create(); http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/d221b274/proton-c/bindings/cpp/include/proton/session.hpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/include/proton/session.hpp b/proton-c/bindings/cpp/include/proton/session.hpp index c07e6d3..7873775 100644 --- a/proton-c/bindings/cpp/include/proton/session.hpp +++ b/proton-c/bindings/cpp/include/proton/session.hpp @@ -42,7 +42,7 @@ class transport; class session : public object<pn_session_t>, public endpoint { public: - session(pn_session_t* s=0) : object(s) {} + session(pn_session_t* s=0) : object<pn_session_t>(s) {} /** Initiate local open, not complete till messaging_handler::on_session_opened() * or proton_handler::on_session_remote_open() http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/d221b274/proton-c/bindings/cpp/include/proton/task.hpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/include/proton/task.hpp b/proton-c/bindings/cpp/include/proton/task.hpp index 8409e10..ffa0b11 100644 --- a/proton-c/bindings/cpp/include/proton/task.hpp +++ b/proton-c/bindings/cpp/include/proton/task.hpp @@ -31,7 +31,7 @@ namespace proton { /** A task for timer events */ class task : public object<pn_task_t> { public: - task(pn_task_t* t) : object(t) {} + task(pn_task_t* t) : object<pn_task_t>(t) {} /** Cancel the scheduled task. */ PN_CPP_EXTERN void cancel(); http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/d221b274/proton-c/bindings/cpp/include/proton/transport.hpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/include/proton/transport.hpp b/proton-c/bindings/cpp/include/proton/transport.hpp index 0f1bf66..d60786a 100644 --- a/proton-c/bindings/cpp/include/proton/transport.hpp +++ b/proton-c/bindings/cpp/include/proton/transport.hpp @@ -36,7 +36,7 @@ class connection; class transport : public object<pn_transport_t> { public: - transport(pn_transport_t* t) : object(t) {} + transport(pn_transport_t* t) : object<pn_transport_t>(t) {} class connection connection() const; }; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
