Repository: qpid-proton Updated Branches: refs/heads/master 75faa18e9 -> 1f0df2a55
PROTON-1183: [C++ binding] Move terminus back from proton::internal to proton Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/138ffab4 Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/138ffab4 Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/138ffab4 Branch: refs/heads/master Commit: 138ffab4b916c5010bbd744e438d4df463e22757 Parents: 8ecfec2 Author: Andrew Stitcher <[email protected]> Authored: Tue Apr 26 18:40:45 2016 -0400 Committer: Andrew Stitcher <[email protected]> Committed: Wed Apr 27 17:58:40 2016 -0400 ---------------------------------------------------------------------- proton-c/bindings/cpp/include/proton/source.hpp | 4 ++-- proton-c/bindings/cpp/include/proton/target.hpp | 4 ++-- proton-c/bindings/cpp/include/proton/terminus.hpp | 18 ++++++++---------- proton-c/bindings/cpp/src/node_options.cpp | 6 +++--- proton-c/bindings/cpp/src/receiver_options.cpp | 2 +- proton-c/bindings/cpp/src/terminus.cpp | 3 +-- 6 files changed, 17 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/138ffab4/proton-c/bindings/cpp/include/proton/source.hpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/include/proton/source.hpp b/proton-c/bindings/cpp/include/proton/source.hpp index 4c95bbc..e34632b 100644 --- a/proton-c/bindings/cpp/include/proton/source.hpp +++ b/proton-c/bindings/cpp/include/proton/source.hpp @@ -38,9 +38,9 @@ class receiver; /// The source node is where messages originate. /// /// @see proton::sender proton::receiver proton::target -class source : public internal::terminus { +class source : public terminus { public: - source() : internal::terminus() {} + source() : terminus() {} PN_CPP_EXTERN std::string address() const; /// @cond INTERNAL private: http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/138ffab4/proton-c/bindings/cpp/include/proton/target.hpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/include/proton/target.hpp b/proton-c/bindings/cpp/include/proton/target.hpp index 4eb77a4..1658b26 100644 --- a/proton-c/bindings/cpp/include/proton/target.hpp +++ b/proton-c/bindings/cpp/include/proton/target.hpp @@ -38,9 +38,9 @@ class receiver; /// The target is the destination node of a sent or received message. /// /// @see proton::sender proton::receiver proton::target -class target : public internal::terminus { +class target : public terminus { public: - target() : internal::terminus() {} + target() : terminus() {} PN_CPP_EXTERN std::string address() const; /// @cond INTERNAL private: http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/138ffab4/proton-c/bindings/cpp/include/proton/terminus.hpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/include/proton/terminus.hpp b/proton-c/bindings/cpp/include/proton/terminus.hpp index 17abf5e..99f5f13 100644 --- a/proton-c/bindings/cpp/include/proton/terminus.hpp +++ b/proton-c/bindings/cpp/include/proton/terminus.hpp @@ -32,11 +32,9 @@ namespace proton { -class source; -class target; -class source_options; - namespace internal { +class noderef; +} /// One end of a link, either a source or a target. /// @@ -95,14 +93,14 @@ class terminus { pn_link_t* parent_; - friend class factory<terminus>; - friend class noderef; - friend class proton::source; - friend class proton::target; - friend class proton::source_options; + friend class internal::factory<terminus>; + friend class internal::noderef; + friend class source; + friend class target; + friend class source_options; /// @endcond }; -}} +} #endif // PROTON_CPP_TERMINUS_H http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/138ffab4/proton-c/bindings/cpp/src/node_options.cpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/src/node_options.cpp b/proton-c/bindings/cpp/src/node_options.cpp index 45aa154..56c823c 100644 --- a/proton-c/bindings/cpp/src/node_options.cpp +++ b/proton-c/bindings/cpp/src/node_options.cpp @@ -53,7 +53,7 @@ namespace { using internal::noderef; -void node_address(internal::terminus &t, option<std::string> &addr, option<bool> &dynamic) { +void node_address(terminus &t, option<std::string> &addr, option<bool> &dynamic) { if (dynamic.set && dynamic.value) { noderef::dynamic(t, true); // Ignore any addr value for dynamic. @@ -64,11 +64,11 @@ void node_address(internal::terminus &t, option<std::string> &addr, option<bool> } } -void node_durability(internal::terminus &t, option<enum durability_mode> &mode) { +void node_durability(terminus &t, option<enum durability_mode> &mode) { if (mode.set) noderef::durability_mode(t, mode.value); } -void node_expiry(internal::terminus &t, option<enum expiry_policy> &policy, option<duration> &d) { +void node_expiry(terminus &t, option<enum expiry_policy> &policy, option<duration> &d) { if (policy.set) noderef::expiry_policy(t, policy.value); if (d.set) noderef::timeout(t, d.value); } http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/138ffab4/proton-c/bindings/cpp/src/receiver_options.cpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/src/receiver_options.cpp b/proton-c/bindings/cpp/src/receiver_options.cpp index 43eb998..1831d11 100644 --- a/proton-c/bindings/cpp/src/receiver_options.cpp +++ b/proton-c/bindings/cpp/src/receiver_options.cpp @@ -83,7 +83,7 @@ class receiver_options::impl { if (auto_accept.set) r.context().auto_accept = auto_accept.value; if (credit_window.set) r.context().credit_window = credit_window.value; - internal::terminus local_src(make_wrapper(pn_link_source(r.pn_object()))); + terminus local_src(make_wrapper(pn_link_source(r.pn_object()))); if (source.set) { proton::source local_s(pn_link_source(r.pn_object())); source.value.apply(local_s); http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/138ffab4/proton-c/bindings/cpp/src/terminus.cpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/src/terminus.cpp b/proton-c/bindings/cpp/src/terminus.cpp index 494c09c..396d823 100644 --- a/proton-c/bindings/cpp/src/terminus.cpp +++ b/proton-c/bindings/cpp/src/terminus.cpp @@ -27,7 +27,6 @@ #include <limits> namespace proton { -namespace internal { terminus::terminus(pn_terminus_t* t) : object_(t), properties_(pn_terminus_properties(t)), filter_(pn_terminus_filter(t)), parent_(0) @@ -101,4 +100,4 @@ value& terminus::node_properties() { return properties_; } const value& terminus::node_properties() const { return properties_; } -}} +} --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
