Repository: qpid-proton Updated Branches: refs/heads/master f063ff1e7 -> d7e6e1753
PROTON-1153: [C++ binding] Removed unused code/enums Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/a65782a9 Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/a65782a9 Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/a65782a9 Branch: refs/heads/master Commit: a65782a977a1b9bd67070ae2518afbb31b35f5ab Parents: f063ff1 Author: Andrew Stitcher <[email protected]> Authored: Wed May 4 19:34:55 2016 -0400 Committer: Andrew Stitcher <[email protected]> Committed: Thu May 5 15:20:02 2016 -0400 ---------------------------------------------------------------------- proton-c/bindings/cpp/include/proton/link.hpp | 8 -------- .../cpp/include/proton/receiver_options.hpp | 9 --------- .../bindings/cpp/include/proton/sender_options.hpp | 7 ------- proton-c/bindings/cpp/src/link.cpp | 17 ----------------- 4 files changed, 41 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/a65782a9/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 a9622ed..f57754c 100644 --- a/proton-c/bindings/cpp/include/proton/link.hpp +++ b/proton-c/bindings/cpp/include/proton/link.hpp @@ -119,14 +119,6 @@ PN_CPP_CLASS_EXTERN link : public internal::object<pn_link_t> , public endpoint /// handler::on_link_open. void attach(); - private: - /// XXX local versus remote, mutability - /// XXX - local_sender_settle_mode and local_receiver_settle_mode - sender_options::sender_settle_mode sender_settle_mode(); - receiver_options::receiver_settle_mode receiver_settle_mode(); - sender_options::sender_settle_mode remote_sender_settle_mode(); - receiver_options::receiver_settle_mode remote_receiver_settle_mode(); - friend class internal::factory<link>; ///@endcond }; http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/a65782a9/proton-c/bindings/cpp/include/proton/receiver_options.hpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/include/proton/receiver_options.hpp b/proton-c/bindings/cpp/include/proton/receiver_options.hpp index babc602..5e2d62a 100644 --- a/proton-c/bindings/cpp/include/proton/receiver_options.hpp +++ b/proton-c/bindings/cpp/include/proton/receiver_options.hpp @@ -61,15 +61,6 @@ class target_options; /// the options. class receiver_options { public: - /// @cond INTERNAL - /// XXX discuss the names - /// Receiver settlement behaviour. - enum receiver_settle_mode { - SETTLE_ALWAYS = PN_RCV_FIRST, - SETTLE_SECOND = PN_RCV_SECOND - }; - /// @endcond - /// Create an empty set of options. PN_CPP_EXTERN receiver_options(); http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/a65782a9/proton-c/bindings/cpp/include/proton/sender_options.hpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/include/proton/sender_options.hpp b/proton-c/bindings/cpp/include/proton/sender_options.hpp index 2aab021..3569171 100644 --- a/proton-c/bindings/cpp/include/proton/sender_options.hpp +++ b/proton-c/bindings/cpp/include/proton/sender_options.hpp @@ -62,13 +62,6 @@ class target_options; /// the options. class sender_options { public: - /// Sender settlement behaviour. - enum sender_settle_mode { - UNSETTLED = PN_SND_UNSETTLED, - SETTLED = PN_SND_SETTLED, - MIXED = PN_SND_MIXED - }; - /// Create an empty set of options. PN_CPP_EXTERN sender_options(); http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/a65782a9/proton-c/bindings/cpp/src/link.cpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/src/link.cpp b/proton-c/bindings/cpp/src/link.cpp index 02a061d..725b3b3 100644 --- a/proton-c/bindings/cpp/src/link.cpp +++ b/proton-c/bindings/cpp/src/link.cpp @@ -73,21 +73,4 @@ class session link::session() const { error_condition link::error() const { return make_wrapper(pn_link_remote_condition(pn_object())); } - -sender_options::sender_settle_mode link::sender_settle_mode() { - return (sender_options::sender_settle_mode) pn_link_snd_settle_mode(pn_object()); -} - -receiver_options::receiver_settle_mode link::receiver_settle_mode() { - return (receiver_options::receiver_settle_mode) pn_link_rcv_settle_mode(pn_object()); -} - -sender_options::sender_settle_mode link::remote_sender_settle_mode() { - return (sender_options::sender_settle_mode) pn_link_remote_snd_settle_mode(pn_object()); -} - -receiver_options::receiver_settle_mode link::remote_receiver_settle_mode() { - return (receiver_options::receiver_settle_mode) pn_link_remote_rcv_settle_mode(pn_object()); -} - } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
