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 2016/03/02 16:42:55 UTC
[5/5] qpid-proton git commit: PROTON-1151: [C++ binding] Move pn_ptr
and object into the proton::internal namespace.
PROTON-1151: [C++ binding] Move pn_ptr and object into the proton::internal namespace.
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/d79c23d1
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/d79c23d1
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/d79c23d1
Branch: refs/heads/master
Commit: d79c23d1810c866ba6ffc93cb140413c5319009b
Parents: d758832
Author: Andrew Stitcher <as...@apache.org>
Authored: Mon Feb 29 17:36:48 2016 -0500
Committer: Andrew Stitcher <as...@apache.org>
Committed: Wed Mar 2 10:36:12 2016 -0500
----------------------------------------------------------------------
proton-c/bindings/cpp/include/proton/acceptor.hpp | 6 +++---
proton-c/bindings/cpp/include/proton/connection.hpp | 6 +++---
proton-c/bindings/cpp/include/proton/data.hpp | 6 +++---
proton-c/bindings/cpp/include/proton/decoder.hpp | 4 ++--
proton-c/bindings/cpp/include/proton/delivery.hpp | 6 +++---
proton-c/bindings/cpp/include/proton/encoder.hpp | 4 ++--
proton-c/bindings/cpp/include/proton/link.hpp | 6 +++---
proton-c/bindings/cpp/include/proton/object.hpp | 3 ++-
proton-c/bindings/cpp/include/proton/session.hpp | 4 ++--
proton-c/bindings/cpp/include/proton/task.hpp | 4 ++--
proton-c/bindings/cpp/include/proton/transport.hpp | 5 ++---
proton-c/bindings/cpp/src/connection_engine.cpp | 8 ++++----
proton-c/bindings/cpp/src/container_impl.cpp | 14 +++++++-------
proton-c/bindings/cpp/src/container_impl.hpp | 2 +-
proton-c/bindings/cpp/src/data.cpp | 2 +-
proton-c/bindings/cpp/src/link.cpp | 2 +-
proton-c/bindings/cpp/src/object.cpp | 3 ++-
proton-c/bindings/cpp/src/proton_handler.hpp | 2 +-
proton-c/bindings/cpp/src/reactor.cpp | 2 +-
proton-c/bindings/cpp/src/reactor.hpp | 4 ++--
20 files changed, 47 insertions(+), 46 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/d79c23d1/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 684fcfb..64bd2e4 100644
--- a/proton-c/bindings/cpp/include/proton/acceptor.hpp
+++ b/proton-c/bindings/cpp/include/proton/acceptor.hpp
@@ -33,13 +33,13 @@ namespace proton {
/// A context for accepting inbound connections.
///
/// @see container::listen
-class acceptor : public object<pn_acceptor_t> {
+class acceptor : public internal::object<pn_acceptor_t> {
/// @cond INTERNAL
- acceptor(pn_acceptor_t* a) : object<pn_acceptor_t>(a) {}
+ acceptor(pn_acceptor_t* a) : internal::object<pn_acceptor_t>(a) {}
/// @endcond
public:
- acceptor() : object<pn_acceptor_t>(0) {}
+ acceptor() : internal::object<pn_acceptor_t>(0) {}
/// Close the acceptor.
PN_CPP_EXTERN void close();
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/d79c23d1/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 6dfe86f..b541c12 100644
--- a/proton-c/bindings/cpp/include/proton/connection.hpp
+++ b/proton-c/bindings/cpp/include/proton/connection.hpp
@@ -39,13 +39,13 @@ class handler;
/// A connection to a remote AMQP peer.
class
-PN_CPP_CLASS_EXTERN connection : public object<pn_connection_t>, public endpoint {
+PN_CPP_CLASS_EXTERN connection : public internal::object<pn_connection_t>, public endpoint {
/// @cond INTERNAL
- connection(pn_connection_t* c) : object<pn_connection_t>(c) {}
+ connection(pn_connection_t* c) : internal::object<pn_connection_t>(c) {}
/// @endcond
public:
- connection() : object<pn_connection_t>(0) {}
+ connection() : internal::object<pn_connection_t>(0) {}
/// Get the state of this connection.
PN_CPP_EXTERN endpoint::state state() const;
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/d79c23d1/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 09cca58..151b9d9 100644
--- a/proton-c/bindings/cpp/include/proton/data.hpp
+++ b/proton-c/bindings/cpp/include/proton/data.hpp
@@ -39,9 +39,9 @@ class data;
/// Holds a sequence of AMQP values, allows inserting and extracting
/// via encoder() and decoder(). Cannot be directly instantiated, use
/// `value`.
-class data : public object<pn_data_t> {
+class data : public internal::object<pn_data_t> {
public:
- data(pn_data_t* d=0) : object<pn_data_t>(d) {}
+ data(pn_data_t* d=0) : internal::object<pn_data_t>(d) {}
PN_CPP_EXTERN static data create();
@@ -93,7 +93,7 @@ class data : public object<pn_data_t> {
friend PN_CPP_EXTERN std::ostream& operator<<(std::ostream&, const data&);
friend class value;
private:
- data(pn_ptr<pn_data_t> d) : object<pn_data_t>(d) {}
+ data(internal::pn_ptr<pn_data_t> d) : internal::object<pn_data_t>(d) {}
class decoder decoder() const { return const_cast<data*>(this)->decoder(); }
};
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/d79c23d1/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 a96be88..1f66559 100644
--- a/proton-c/bindings/cpp/include/proton/decoder.hpp
+++ b/proton-c/bindings/cpp/include/proton/decoder.hpp
@@ -73,9 +73,9 @@ struct rewind{};
///
/// Internal use only, see proton::value, proton::scalar and proton::amqp
/// for the recommended ways to manage AMQP data.
-class decoder : public object<pn_data_t> {
+class decoder : public internal::object<pn_data_t> {
public:
- decoder(pn_data_t* d) : object<pn_data_t>(d) {}
+ decoder(pn_data_t* d) : internal::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/d79c23d1/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 8170357..062cf8f 100644
--- a/proton-c/bindings/cpp/include/proton/delivery.hpp
+++ b/proton-c/bindings/cpp/include/proton/delivery.hpp
@@ -33,13 +33,13 @@ namespace proton {
/// A message transfer. Every delivery exists within the context of a
/// proton::link. A delivery attempt can fail. As a result, a
/// particular message may correspond to multiple deliveries.
-class delivery : public object<pn_delivery_t> {
+class delivery : public internal::object<pn_delivery_t> {
/// @cond INTERNAL
- delivery(pn_delivery_t* d) : object<pn_delivery_t>(d) {}
+ delivery(pn_delivery_t* d) : internal::object<pn_delivery_t>(d) {}
/// @endcond
public:
- delivery() : object<pn_delivery_t>(0) {}
+ delivery() : internal::object<pn_delivery_t>(0) {}
/// Return the link for this delivery
PN_CPP_EXTERN class link link() const;
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/d79c23d1/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 8fbb83a..045bd4e 100644
--- a/proton-c/bindings/cpp/include/proton/encoder.hpp
+++ b/proton-c/bindings/cpp/include/proton/encoder.hpp
@@ -76,9 +76,9 @@ template <type_id A, class T> cref<T, A> as(const T& value) { return cref<T, A>(
///
/// Internal use only, see proton::value, proton::scalar and proton::amqp
/// for the recommended ways to manage AMQP data.
-class encoder : public object<pn_data_t> {
+class encoder : public internal::object<pn_data_t> {
public:
- encoder(pn_data_t* e) : object<pn_data_t>(e) {}
+ encoder(pn_data_t* e) : internal::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/d79c23d1/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 e5dd2f1..a873af6 100644
--- a/proton-c/bindings/cpp/include/proton/link.hpp
+++ b/proton-c/bindings/cpp/include/proton/link.hpp
@@ -41,13 +41,13 @@ class condition;
/// 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
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/d79c23d1/proton-c/bindings/cpp/include/proton/object.hpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/include/proton/object.hpp b/proton-c/bindings/cpp/include/proton/object.hpp
index 8f4dfb2..5ecffa5 100644
--- a/proton-c/bindings/cpp/include/proton/object.hpp
+++ b/proton-c/bindings/cpp/include/proton/object.hpp
@@ -28,6 +28,7 @@
#include <memory>
namespace proton {
+namespace internal {
class pn_ptr_base {
protected:
@@ -84,7 +85,7 @@ template <class T> class object : private comparable<object<T> > {
friend bool operator<(const object& a, const object& b) { return a.object_ < b.object_; }
};
-}
+}}
/// @endcond
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/d79c23d1/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 73009e1..f27499d 100644
--- a/proton-c/bindings/cpp/include/proton/session.hpp
+++ b/proton-c/bindings/cpp/include/proton/session.hpp
@@ -40,11 +40,11 @@ class handler;
/// A container of links.
class
-PN_CPP_CLASS_EXTERN session : public object<pn_session_t>, public endpoint
+PN_CPP_CLASS_EXTERN session : public internal::object<pn_session_t>, public endpoint
{
public:
/// @cond INTERNAL
- session(pn_session_t* s=0) : object<pn_session_t>(s) {}
+ session(pn_session_t* s=0) : internal::object<pn_session_t>(s) {}
/// @endcond
// Endpoint behaviours
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/d79c23d1/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 07b7a5d..b833a48 100644
--- a/proton-c/bindings/cpp/include/proton/task.hpp
+++ b/proton-c/bindings/cpp/include/proton/task.hpp
@@ -33,9 +33,9 @@
namespace proton {
/// A task for timer events.
-class task : public object<pn_task_t> {
+class task : public internal::object<pn_task_t> {
public:
- task(pn_task_t* t) : object<pn_task_t>(t) {}
+ task(pn_task_t* t) : internal::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/d79c23d1/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 2d11677..0cb84f3 100644
--- a/proton-c/bindings/cpp/include/proton/transport.hpp
+++ b/proton-c/bindings/cpp/include/proton/transport.hpp
@@ -34,10 +34,9 @@ class connection;
class condition;
class sasl;
-/// A network layer supporting an AMQP connection.
-class transport : public object<pn_transport_t> {
+class transport : public internal::object<pn_transport_t> {
/// @cond INTERNAL
- transport(pn_transport_t* t) : object<pn_transport_t>(t) {}
+ transport(pn_transport_t* t) : internal::object<pn_transport_t>(t) {}
/// @endcond
public:
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/d79c23d1/proton-c/bindings/cpp/src/connection_engine.cpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/connection_engine.cpp b/proton-c/bindings/cpp/src/connection_engine.cpp
index 043c96e..be9efeb 100644
--- a/proton-c/bindings/cpp/src/connection_engine.cpp
+++ b/proton-c/bindings/cpp/src/connection_engine.cpp
@@ -85,9 +85,9 @@ void connection_engine::container::options(const connection_options &opts) {
}
connection_engine::connection_engine(class handler &h, const connection_options& opts) {
- connection_ = proton::connection(take_ownership(pn_connection()).get());
- pn_ptr<pn_transport_t> transport = take_ownership(pn_transport());
- pn_ptr<pn_collector_t> collector = take_ownership(pn_collector());
+ connection_ = proton::connection(internal::take_ownership(pn_connection()).get());
+ internal::pn_ptr<pn_transport_t> transport = internal::take_ownership(pn_transport());
+ internal::pn_ptr<pn_collector_t> collector = internal::take_ownership(pn_collector());
if (!connection_ || !transport || !collector)
throw proton::error("engine create");
int err = pn_transport_bind(transport.get(), connection_.pn_object());
@@ -115,7 +115,7 @@ connection_engine::connection_engine(class handler &h, const connection_options&
connection_engine::~connection_engine() {
pn_transport_unbind(ctx_->transport);
pn_transport_free(ctx_->transport);
- pn_ptr<pn_connection_t> c(connection_.pn_object());
+ internal::pn_ptr<pn_connection_t> c(connection_.pn_object());
connection_ = proton::connection();
pn_connection_free(c.release());
pn_collector_free(ctx_->collector);
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/d79c23d1/proton-c/bindings/cpp/src/container_impl.cpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/container_impl.cpp b/proton-c/bindings/cpp/src/container_impl.cpp
index 86571ec..55547ca 100644
--- a/proton-c/bindings/cpp/src/container_impl.cpp
+++ b/proton-c/bindings/cpp/src/container_impl.cpp
@@ -82,7 +82,7 @@ struct handler_context {
class override_handler : public proton_handler
{
public:
- pn_ptr<pn_handler_t> base_handler;
+ internal::pn_ptr<pn_handler_t> base_handler;
container_impl &container_impl_;
override_handler(pn_handler_t *h, container_impl &c) : base_handler(h), container_impl_(c) {}
@@ -109,9 +109,9 @@ class override_handler : public proton_handler
}
};
-pn_ptr<pn_handler_t> container_impl::cpp_handler(proton_handler *h) {
+internal::pn_ptr<pn_handler_t> container_impl::cpp_handler(proton_handler *h) {
if (!h->pn_handler_) {
- h->pn_handler_ = take_ownership(
+ h->pn_handler_ = internal::take_ownership(
pn_handler_new(&handler_context::dispatch,
sizeof(struct handler_context),
&handler_context::cleanup));
@@ -131,7 +131,7 @@ container_impl::container_impl(container& c, messaging_adapter *h, const std::st
// Set our own global handler that "subclasses" the existing one
pn_handler_t *global_handler = reactor_.pn_global_handler();
override_handler_.reset(new override_handler(global_handler, *this));
- pn_ptr<pn_handler_t> cpp_global_handler(cpp_handler(override_handler_.get()));
+ internal::pn_ptr<pn_handler_t> cpp_global_handler(cpp_handler(override_handler_.get()));
reactor_.pn_global_handler(cpp_global_handler.get());
if (handler_) {
reactor_.pn_handler(cpp_handler(handler_).get());
@@ -150,7 +150,7 @@ connection container_impl::connect(const proton::url &url, const connection_opti
opts.override(user_opts);
proton_handler *h = opts.handler();
- pn_ptr<pn_handler_t> chandler = h ? cpp_handler(h) : pn_ptr<pn_handler_t>();
+ internal::pn_ptr<pn_handler_t> chandler = h ? cpp_handler(h) : internal::pn_ptr<pn_handler_t>();
connection conn(reactor_.connection(chandler.get()));
internal::pn_unique_ptr<connector> ctor(new connector(conn, opts));
ctor->address(url); // TODO: url vector
@@ -193,7 +193,7 @@ acceptor container_impl::listen(const proton::url& url, const connection_options
connection_options opts = server_connection_options(); // Defaults
opts.override(user_opts);
proton_handler *h = opts.handler();
- pn_ptr<pn_handler_t> chandler = h ? cpp_handler(h) : pn_ptr<pn_handler_t>();
+ internal::pn_ptr<pn_handler_t> chandler = h ? cpp_handler(h) : internal::pn_ptr<pn_handler_t>();
pn_acceptor_t *acptr = pn_reactor_acceptor(reactor_.pn_object(), url.host().c_str(), url.port().c_str(), chandler.get());
if (!acptr)
throw error(MSG("accept fail: " <<
@@ -208,7 +208,7 @@ acceptor container_impl::listen(const proton::url& url, const connection_options
}
task container_impl::schedule(int delay, proton_handler *h) {
- pn_ptr<pn_handler_t> task_handler;
+ internal::pn_ptr<pn_handler_t> task_handler;
if (h)
task_handler = cpp_handler(h);
return reactor_.schedule(delay, task_handler.get());
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/d79c23d1/proton-c/bindings/cpp/src/container_impl.hpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/container_impl.hpp b/proton-c/bindings/cpp/src/container_impl.hpp
index cb098fc..f6dc802 100644
--- a/proton-c/bindings/cpp/src/container_impl.hpp
+++ b/proton-c/bindings/cpp/src/container_impl.hpp
@@ -65,7 +65,7 @@ class container_impl
void configure_server_connection(connection &c);
task schedule(int delay, proton_handler *h);
- pn_ptr<pn_handler_t> cpp_handler(proton_handler *h);
+ internal::pn_ptr<pn_handler_t> cpp_handler(proton_handler *h);
std::string next_link_name();
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/d79c23d1/proton-c/bindings/cpp/src/data.cpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/data.cpp b/proton-c/bindings/cpp/src/data.cpp
index 74e20db..3cd2bc8 100644
--- a/proton-c/bindings/cpp/src/data.cpp
+++ b/proton-c/bindings/cpp/src/data.cpp
@@ -67,7 +67,7 @@ std::ostream& operator<<(std::ostream& o, const data& d) {
return o << inspectable(d.pn_object());
}
-data data::create() { return take_ownership(pn_data(0)); }
+data data::create() { return internal::take_ownership(pn_data(0)); }
encoder data::encoder() { return proton::encoder(pn_object()); }
decoder data::decoder() { return proton::decoder(pn_object()); }
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/d79c23d1/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 c84d80f..5b4543b 100644
--- a/proton-c/bindings/cpp/src/link.cpp
+++ b/proton-c/bindings/cpp/src/link.cpp
@@ -86,7 +86,7 @@ class session link::session() const {
void link::handler(proton_handler &h) {
pn_record_t *record = pn_link_attachments(pn_object());
- pn_ptr<pn_handler_t> chandler = connection().container().impl_->cpp_handler(&h);
+ internal::pn_ptr<pn_handler_t> chandler = connection().container().impl_->cpp_handler(&h);
pn_record_set_handler(record, chandler.get());
}
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/d79c23d1/proton-c/bindings/cpp/src/object.cpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/object.cpp b/proton-c/bindings/cpp/src/object.cpp
index 9fde50f..a891b20 100644
--- a/proton-c/bindings/cpp/src/object.cpp
+++ b/proton-c/bindings/cpp/src/object.cpp
@@ -21,6 +21,7 @@
#include <proton/object.h>
namespace proton {
+namespace internal {
void pn_ptr_base::incref(void *p) {
if (p) ::pn_incref(const_cast<void*>(p));
@@ -30,4 +31,4 @@ void pn_ptr_base::decref(void *p) {
if (p) ::pn_decref(const_cast<void*>(p));
}
-}
+}}
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/d79c23d1/proton-c/bindings/cpp/src/proton_handler.hpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/proton_handler.hpp b/proton-c/bindings/cpp/src/proton_handler.hpp
index 09b170d..326b89c 100644
--- a/proton-c/bindings/cpp/src/proton_handler.hpp
+++ b/proton-c/bindings/cpp/src/proton_handler.hpp
@@ -95,7 +95,7 @@ class proton_handler
std::vector<proton_handler*> children_;
typedef std::vector<proton_handler*>::iterator iterator;
friend class proton_event;
- pn_ptr<pn_handler_t> pn_handler_;
+ internal::pn_ptr<pn_handler_t> pn_handler_;
friend class container_impl;
};
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/d79c23d1/proton-c/bindings/cpp/src/reactor.cpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/reactor.cpp b/proton-c/bindings/cpp/src/reactor.cpp
index 62508ba..c326a7f 100644
--- a/proton-c/bindings/cpp/src/reactor.cpp
+++ b/proton-c/bindings/cpp/src/reactor.cpp
@@ -31,7 +31,7 @@
namespace proton {
reactor reactor::create() {
- return take_ownership(pn_reactor()).get();
+ return internal::take_ownership(pn_reactor()).get();
}
void reactor::run() { pn_reactor_run(pn_object()); }
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/d79c23d1/proton-c/bindings/cpp/src/reactor.hpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/reactor.hpp b/proton-c/bindings/cpp/src/reactor.hpp
index 4f8851d..05bfa3d 100644
--- a/proton-c/bindings/cpp/src/reactor.hpp
+++ b/proton-c/bindings/cpp/src/reactor.hpp
@@ -39,9 +39,9 @@ class url;
class handler;
class task;
-class reactor : public object<pn_reactor_t> {
+class reactor : public internal::object<pn_reactor_t> {
public:
- reactor(pn_reactor_t* r = 0) : object<pn_reactor_t>(r) {}
+ reactor(pn_reactor_t* r = 0) : internal::object<pn_reactor_t>(r) {}
/** Create a new reactor. */
PN_CPP_EXTERN static reactor create();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org