You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by cl...@apache.org on 2016/05/02 23:16:24 UTC
qpid-proton git commit: NO-JIRA: c++ binding compiler fixes for 4.4.7
Repository: qpid-proton
Updated Branches:
refs/heads/master 07ab957ff -> 3e72c288d
NO-JIRA: c++ binding compiler fixes for 4.4.7
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/3e72c288
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/3e72c288
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/3e72c288
Branch: refs/heads/master
Commit: 3e72c288debe994d2248ef2adc9599dd3dfec8e4
Parents: 07ab957
Author: Clifford Jansen <cl...@apache.org>
Authored: Mon May 2 14:15:44 2016 -0700
Committer: Clifford Jansen <cl...@apache.org>
Committed: Mon May 2 14:15:44 2016 -0700
----------------------------------------------------------------------
proton-c/bindings/cpp/include/proton/receiver.hpp | 4 ++--
proton-c/bindings/cpp/include/proton/sender.hpp | 4 ++--
proton-c/bindings/cpp/src/node_options.cpp | 13 +++++--------
3 files changed, 9 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3e72c288/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 cfc480f..0bdff5d 100644
--- a/proton-c/bindings/cpp/include/proton/receiver.hpp
+++ b/proton-c/bindings/cpp/include/proton/receiver.hpp
@@ -61,12 +61,12 @@ PN_CPP_CLASS_EXTERN receiver : public link {
class receiver_iterator : public internal::iter_base<receiver, receiver_iterator> {
///@cond INTERNAL
explicit receiver_iterator(receiver r, pn_session_t* s = 0) :
- iter_base<receiver, receiver_iterator>(r), session_(s) {}
+ internal::iter_base<receiver, receiver_iterator>(r), session_(s) {}
///@endcond
public:
explicit receiver_iterator() :
- iter_base<receiver, receiver_iterator>(0), session_(0) {}
+ internal::iter_base<receiver, receiver_iterator>(0), session_(0) {}
/// Advance
PN_CPP_EXTERN receiver_iterator operator++();
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3e72c288/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 7fff04a..452809e 100644
--- a/proton-c/bindings/cpp/include/proton/sender.hpp
+++ b/proton-c/bindings/cpp/include/proton/sender.hpp
@@ -67,12 +67,12 @@ PN_CPP_CLASS_EXTERN sender : public link
class sender_iterator : public internal::iter_base<sender, sender_iterator> {
///@cond INTERNAL
sender_iterator(sender snd, pn_session_t* s = 0) :
- iter_base<sender, sender_iterator>(snd), session_(s) {}
+ internal::iter_base<sender, sender_iterator>(snd), session_(s) {}
///@endcond
public:
sender_iterator() :
- iter_base<sender, sender_iterator>(0), session_(0) {}
+ internal::iter_base<sender, sender_iterator>(0), session_(0) {}
/// Advance
PN_CPP_EXTERN sender_iterator operator++();
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3e72c288/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 7eebec6..ade5dd9 100644
--- a/proton-c/bindings/cpp/src/node_options.cpp
+++ b/proton-c/bindings/cpp/src/node_options.cpp
@@ -40,10 +40,7 @@ template <class T> struct option {
};
namespace {
- void address(terminus &t, const std::string &s) { pn_terminus_set_address(unwrap(t), s.c_str()); }
- void set_dynamic(terminus &t, bool b) { pn_terminus_set_dynamic(unwrap(t), b); }
- void durability_mode(terminus &t, enum durability_mode m) { pn_terminus_set_durability(unwrap(t), pn_durability_t(m)); }
- void expiry_policy(terminus &t, enum expiry_policy p) { pn_terminus_set_expiry_policy(unwrap(t), pn_expiry_policy_t(p)); }
+
void timeout(terminus &t, duration d) {
uint32_t seconds = 0;
if (d == duration::FOREVER)
@@ -67,21 +64,21 @@ namespace {
void node_address(terminus &t, option<std::string> &addr, option<bool> &dynamic) {
if (dynamic.set && dynamic.value) {
- set_dynamic(t, true);
+ pn_terminus_set_dynamic(unwrap(t), true);
// Ignore any addr value for dynamic.
return;
}
if (addr.set) {
- address(t, addr.value);
+ pn_terminus_set_address(unwrap(t), addr.value.c_str());
}
}
void node_durability(terminus &t, option<enum durability_mode> &mode) {
- if (mode.set) durability_mode(t, mode.value);
+ if (mode.set) pn_terminus_set_durability(unwrap(t), pn_durability_t(mode.value));
}
void node_expiry(terminus &t, option<enum expiry_policy> &policy, option<duration> &d) {
- if (policy.set) expiry_policy(t, policy.value);
+ if (policy.set) pn_terminus_set_expiry_policy(unwrap(t), pn_expiry_policy_t(policy.value));
if (d.set) timeout(t, d.value);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org