You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by as...@apache.org on 2017/07/21 17:02:04 UTC
[08/20] qpid-proton git commit: NO-JIRA: Header file corrections
NO-JIRA: Header file corrections
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/d168b7be
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/d168b7be
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/d168b7be
Branch: refs/heads/master
Commit: d168b7be34c831494ee172dd216ec7fe438845ce
Parents: 1a513d6
Author: Andrew Stitcher <as...@apache.org>
Authored: Fri Mar 3 15:51:58 2017 -0500
Committer: Andrew Stitcher <as...@apache.org>
Committed: Fri Jul 21 12:50:06 2017 -0400
----------------------------------------------------------------------
proton-c/bindings/cpp/src/connection.cpp | 1 +
proton-c/bindings/cpp/src/connection_options.cpp | 1 +
proton-c/bindings/cpp/src/contexts.cpp | 3 +++
proton-c/bindings/cpp/src/include/contexts.hpp | 10 +++-------
proton-c/bindings/cpp/src/io/connection_driver.cpp | 1 +
proton-c/bindings/cpp/src/io/link_namer.cpp | 5 ++++-
proton-c/bindings/cpp/src/messaging_adapter.cpp | 4 ++++
proton-c/bindings/cpp/src/session.cpp | 1 +
8 files changed, 18 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/d168b7be/proton-c/bindings/cpp/src/connection.cpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/connection.cpp b/proton-c/bindings/cpp/src/connection.cpp
index 113a06f..11d5624 100644
--- a/proton-c/bindings/cpp/src/connection.cpp
+++ b/proton-c/bindings/cpp/src/connection.cpp
@@ -22,6 +22,7 @@
#include "proton_bits.hpp"
#include "proton/connection.hpp"
+#include "proton/connection_options.hpp"
#include "proton/container.hpp"
#include "proton/error.hpp"
#include "proton/event_loop.hpp"
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/d168b7be/proton-c/bindings/cpp/src/connection_options.cpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/connection_options.cpp b/proton-c/bindings/cpp/src/connection_options.cpp
index 6321df5..0848c73 100644
--- a/proton-c/bindings/cpp/src/connection_options.cpp
+++ b/proton-c/bindings/cpp/src/connection_options.cpp
@@ -19,6 +19,7 @@
*
*/
#include "proton/fwd.hpp"
+#include "proton/connection.hpp"
#include "proton/connection_options.hpp"
#include "proton/messaging_handler.hpp"
#include "proton/reconnect_timer.hpp"
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/d168b7be/proton-c/bindings/cpp/src/contexts.cpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/contexts.cpp b/proton-c/bindings/cpp/src/contexts.cpp
index 81ef5eb..152828a 100644
--- a/proton-c/bindings/cpp/src/contexts.cpp
+++ b/proton-c/bindings/cpp/src/contexts.cpp
@@ -23,6 +23,7 @@
#include "msg.hpp"
#include "proton_bits.hpp"
+#include "proton/connection_options.hpp"
#include "proton/error.hpp"
#include <proton/connection.h>
@@ -69,6 +70,8 @@ connection_context::connection_context() :
container(0), default_session(0), link_gen(0), handler(0), listener_context_(0)
{}
+listener_context::listener_context() : listen_handler_(0) {}
+
connection_context& connection_context::get(pn_connection_t *c) {
return ref<connection_context>(id(pn_connection_attachments(c), CONNECTION_CONTEXT));
}
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/d168b7be/proton-c/bindings/cpp/src/include/contexts.hpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/include/contexts.hpp b/proton-c/bindings/cpp/src/include/contexts.hpp
index 637cbec..ab0661a 100644
--- a/proton-c/bindings/cpp/src/include/contexts.hpp
+++ b/proton-c/bindings/cpp/src/include/contexts.hpp
@@ -22,16 +22,10 @@
*
*/
-#include "proton/connection.hpp"
-#include "proton/container.hpp"
-#include "proton/io/connection_driver.hpp"
#include "proton/event_loop.hpp"
-#include "proton/listen_handler.hpp"
#include "proton/message.hpp"
#include "proton/internal/pn_unique_ptr.hpp"
-#include "proton/io/link_namer.hpp"
-
struct pn_record_t;
struct pn_link_t;
struct pn_session_t;
@@ -43,6 +37,8 @@ namespace proton {
class proton_handler;
class reconnect_timer;
+namespace io {class link_namer;}
+
// Base class for C++ classes that are used as proton contexts.
// Contexts are pn_objects managed by pn reference counts, the C++ value is allocated in-place.
class context {
@@ -101,7 +97,7 @@ class connection_context : public context {
class listener_context : public context {
public:
- listener_context() : listen_handler_(0) {}
+ listener_context();
static listener_context& get(pn_listener_t* c);
listen_handler* listen_handler_;
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/d168b7be/proton-c/bindings/cpp/src/io/connection_driver.cpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/io/connection_driver.cpp b/proton-c/bindings/cpp/src/io/connection_driver.cpp
index 0f5bc33..58af052 100644
--- a/proton-c/bindings/cpp/src/io/connection_driver.cpp
+++ b/proton-c/bindings/cpp/src/io/connection_driver.cpp
@@ -19,6 +19,7 @@
#include "proton/io/connection_driver.hpp"
+#include "proton/container.hpp"
#include "proton/event_loop.hpp"
#include "proton/error.hpp"
#include "proton/messaging_handler.hpp"
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/d168b7be/proton-c/bindings/cpp/src/io/link_namer.cpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/io/link_namer.cpp b/proton-c/bindings/cpp/src/io/link_namer.cpp
index 28c35c7..2ac5402 100644
--- a/proton-c/bindings/cpp/src/io/link_namer.cpp
+++ b/proton-c/bindings/cpp/src/io/link_namer.cpp
@@ -18,8 +18,11 @@
*/
#include "proton/io/link_namer.hpp"
-#include "proton_bits.hpp"
+
+#include "proton/connection.hpp"
+
#include "contexts.hpp"
+#include "proton_bits.hpp"
namespace proton {
namespace io {
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/d168b7be/proton-c/bindings/cpp/src/messaging_adapter.cpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/messaging_adapter.cpp b/proton-c/bindings/cpp/src/messaging_adapter.cpp
index 3a16930..521566c 100644
--- a/proton-c/bindings/cpp/src/messaging_adapter.cpp
+++ b/proton-c/bindings/cpp/src/messaging_adapter.cpp
@@ -21,12 +21,16 @@
#include "messaging_adapter.hpp"
+#include "proton/connection.hpp"
+#include "proton/container.hpp"
#include "proton/delivery.hpp"
#include "proton/error.hpp"
#include "proton/messaging_handler.hpp"
+#include "proton/receiver.hpp"
#include "proton/receiver_options.hpp"
#include "proton/sender.hpp"
#include "proton/sender_options.hpp"
+#include "proton/session.hpp"
#include "proton/tracker.hpp"
#include "proton/transport.hpp"
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/d168b7be/proton-c/bindings/cpp/src/session.cpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/session.cpp b/proton-c/bindings/cpp/src/session.cpp
index 8036d2c..a2b318e 100644
--- a/proton-c/bindings/cpp/src/session.cpp
+++ b/proton-c/bindings/cpp/src/session.cpp
@@ -21,6 +21,7 @@
#include "proton/session.hpp"
#include "proton/connection.hpp"
+#include "proton/io/link_namer.hpp"
#include "proton/receiver_options.hpp"
#include "proton/sender_options.hpp"
#include "proton/session_options.hpp"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org