qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From astitc...@apache.org
Subject [2/6] qpid-proton git commit: PROTON-1182: [C++ binding] Move link back from proton::internal::link to proton::link
Date Thu, 28 Apr 2016 00:48:10 GMT
PROTON-1182: [C++ binding] Move link back from proton::internal::link to proton::link


Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/8ecfec2a
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/8ecfec2a
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/8ecfec2a

Branch: refs/heads/master
Commit: 8ecfec2a771bd3d6499b38699e8f37de27e315c4
Parents: 8c1194c
Author: Andrew Stitcher <astitcher@apache.org>
Authored: Tue Apr 26 01:01:59 2016 -0400
Committer: Andrew Stitcher <astitcher@apache.org>
Committed: Wed Apr 27 17:58:40 2016 -0400

----------------------------------------------------------------------
 .../bindings/cpp/include/proton/container.hpp     |  2 +-
 proton-c/bindings/cpp/include/proton/link.hpp     | 18 ++++++++----------
 proton-c/bindings/cpp/include/proton/receiver.hpp |  2 +-
 proton-c/bindings/cpp/include/proton/sender.hpp   |  2 +-
 proton-c/bindings/cpp/src/endpoint.cpp            |  2 --
 proton-c/bindings/cpp/src/engine_test.cpp         |  4 ++--
 proton-c/bindings/cpp/src/link.cpp                |  3 +--
 proton-c/bindings/cpp/src/proton_bits.hpp         |  2 +-
 8 files changed, 15 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/8ecfec2a/proton-c/bindings/cpp/include/proton/container.hpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/include/proton/container.hpp b/proton-c/bindings/cpp/include/proton/container.hpp
index cf7f735..dc66e78 100644
--- a/proton-c/bindings/cpp/include/proton/container.hpp
+++ b/proton-c/bindings/cpp/include/proton/container.hpp
@@ -139,7 +139,7 @@ class container {
 
     friend class connector;
     friend class messaging_adapter;
-    friend class internal::link;
+    friend class link;
     /// @endcond
 };
 

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/8ecfec2a/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 ed2c5ca..3db6f95 100644
--- a/proton-c/bindings/cpp/include/proton/link.hpp
+++ b/proton-c/bindings/cpp/include/proton/link.hpp
@@ -51,18 +51,16 @@ class session;
 class sender_iterator;
 class receiver_iterator;
 
-namespace internal {
-
 /// A named channel for sending or receiving messages.  It is the base
 /// class for sender and receiver.
 class
-PN_CPP_CLASS_EXTERN link : public object<pn_link_t> , public endpoint {
+PN_CPP_CLASS_EXTERN link : public internal::object<pn_link_t> , public endpoint {
     /// @cond INTERNAL
-    link(pn_link_t* l) : object<pn_link_t>(l) {}
+    link(pn_link_t* l) : internal::object<pn_link_t>(l) {}
     /// @endcond
 
   public:
-    link() : object<pn_link_t>(0) {}
+    link() : internal::object<pn_link_t>(0) {}
 
     // Endpoint behaviours
     PN_CPP_EXTERN bool uninitialized() const;
@@ -139,13 +137,13 @@ PN_CPP_CLASS_EXTERN link : public object<pn_link_t> , public endpoint
{
     sender_options::sender_settle_mode remote_sender_settle_mode();
     receiver_options::receiver_settle_mode remote_receiver_settle_mode();
 
-    friend class factory<link>;
-    friend class proton::message;
-    friend class proton::receiver_options;
-    friend class proton::sender_options;
+    friend class internal::factory<link>;
+    friend class message;
+    friend class receiver_options;
+    friend class sender_options;
     ///@endcond
 };
 
-}}
+}
 
 #endif // PROTON_CPP_LINK_H

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/8ecfec2a/proton-c/bindings/cpp/include/proton/receiver.hpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/include/proton/receiver.hpp b/proton-c/bindings/cpp/include/proton/receiver.hpp
index d56f7fd..a63be67 100644
--- a/proton-c/bindings/cpp/include/proton/receiver.hpp
+++ b/proton-c/bindings/cpp/include/proton/receiver.hpp
@@ -34,7 +34,7 @@ namespace proton {
 
 /// A link for receiving messages.
 class
-PN_CPP_CLASS_EXTERN receiver : public internal::link {
+PN_CPP_CLASS_EXTERN receiver : public link {
     /// @cond INTERNAL
     receiver(pn_link_t* r);
     /// @endcond

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/8ecfec2a/proton-c/bindings/cpp/include/proton/sender.hpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/include/proton/sender.hpp b/proton-c/bindings/cpp/include/proton/sender.hpp
index 8beb148..e620ebe 100644
--- a/proton-c/bindings/cpp/include/proton/sender.hpp
+++ b/proton-c/bindings/cpp/include/proton/sender.hpp
@@ -36,7 +36,7 @@ namespace proton {
 
 /// A link for sending messages.
 class
-PN_CPP_CLASS_EXTERN sender : public internal::link
+PN_CPP_CLASS_EXTERN sender : public link
 {
     /// @cond INTERNAL
     sender(pn_link_t* s);

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/8ecfec2a/proton-c/bindings/cpp/src/endpoint.cpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/endpoint.cpp b/proton-c/bindings/cpp/src/endpoint.cpp
index d2dce06..60d9355 100644
--- a/proton-c/bindings/cpp/src/endpoint.cpp
+++ b/proton-c/bindings/cpp/src/endpoint.cpp
@@ -57,7 +57,6 @@ void session::close(const error_condition& condition) {
     close();
 }
 
-namespace internal {
 bool link::uninitialized() const { return ::uninitialized(pn_link_state(pn_object())); }
 bool link::active() const { return ::active(pn_link_state(pn_object())); }
 bool link::closed() const { return ::closed(pn_link_state(pn_object())); }
@@ -66,7 +65,6 @@ void link::close(const error_condition& condition) {
     set_error_condition(condition, pn_link_condition(pn_object()));
     close();
 }
-}
 
 endpoint::~endpoint() {}
 

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/8ecfec2a/proton-c/bindings/cpp/src/engine_test.cpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/engine_test.cpp b/proton-c/bindings/cpp/src/engine_test.cpp
index 5f4b026..007be11 100644
--- a/proton-c/bindings/cpp/src/engine_test.cpp
+++ b/proton-c/bindings/cpp/src/engine_test.cpp
@@ -158,8 +158,8 @@ void test_endpoint_close() {
     e.a.connection().open_receiver("y");
     while (ha.senders.size()+ha.receivers.size() < 2 ||
            hb.senders.size()+hb.receivers.size() < 2) e.process();
-    proton::internal::link ax = quick_pop(ha.senders), ay = quick_pop(ha.receivers);
-    proton::internal::link bx = quick_pop(hb.receivers), by = quick_pop(hb.senders);
+    proton::link ax = quick_pop(ha.senders), ay = quick_pop(ha.receivers);
+    proton::link bx = quick_pop(hb.receivers), by = quick_pop(hb.senders);
 
     // Close a link
     ax.close(proton::error_condition("err", "foo bar"));

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/8ecfec2a/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 68afef7..a12fcdb 100644
--- a/proton-c/bindings/cpp/src/link.cpp
+++ b/proton-c/bindings/cpp/src/link.cpp
@@ -35,7 +35,6 @@
 #include "proton_bits.hpp"
 
 namespace proton {
-namespace internal {
 
 void link::attach() {
     pn_link_open(pn_object());
@@ -122,4 +121,4 @@ link_context &link::context() {
     return link_context::get(pn_object());
 }
 
-}}
+}

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/8ecfec2a/proton-c/bindings/cpp/src/proton_bits.hpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/proton_bits.hpp b/proton-c/bindings/cpp/src/proton_bits.hpp
index f84c978..6a4f5f3 100644
--- a/proton-c/bindings/cpp/src/proton_bits.hpp
+++ b/proton-c/bindings/cpp/src/proton_bits.hpp
@@ -43,7 +43,6 @@ struct pn_terminus_t;
 namespace proton {
 
 namespace internal {
-class link;
 class terminus;
 }
 
@@ -52,6 +51,7 @@ class sasl;
 class ssl;
 class connection;
 class session;
+class link;
 class sender;
 class receiver;
 class transfer;


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message