Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 0734D2009D9 for ; Mon, 2 May 2016 23:16:26 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 05E4B1609B0; Mon, 2 May 2016 23:16:26 +0200 (CEST) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 50D0B1602C5 for ; Mon, 2 May 2016 23:16:25 +0200 (CEST) Received: (qmail 62299 invoked by uid 500); 2 May 2016 21:16:24 -0000 Mailing-List: contact commits-help@qpid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@qpid.apache.org Delivered-To: mailing list commits@qpid.apache.org Received: (qmail 62290 invoked by uid 99); 2 May 2016 21:16:24 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 May 2016 21:16:24 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6F494DFC55; Mon, 2 May 2016 21:16:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: cliffjansen@apache.org To: commits@qpid.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: qpid-proton git commit: NO-JIRA: c++ binding compiler fixes for 4.4.7 Date: Mon, 2 May 2016 21:16:24 +0000 (UTC) archived-at: Mon, 02 May 2016 21:16:26 -0000 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 Authored: Mon May 2 14:15:44 2016 -0700 Committer: Clifford Jansen 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 { ///@cond INTERNAL explicit receiver_iterator(receiver r, pn_session_t* s = 0) : - iter_base(r), session_(s) {} + internal::iter_base(r), session_(s) {} ///@endcond public: explicit receiver_iterator() : - iter_base(0), session_(0) {} + internal::iter_base(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 { ///@cond INTERNAL sender_iterator(sender snd, pn_session_t* s = 0) : - iter_base(snd), session_(s) {} + internal::iter_base(snd), session_(s) {} ///@endcond public: sender_iterator() : - iter_base(0), session_(0) {} + internal::iter_base(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 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 &addr, option &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 &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 &policy, option &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