Return-Path: X-Original-To: apmail-qpid-commits-archive@www.apache.org Delivered-To: apmail-qpid-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B393B18F0F for ; Mon, 25 Jan 2016 22:10:44 +0000 (UTC) Received: (qmail 73406 invoked by uid 500); 25 Jan 2016 22:10:44 -0000 Delivered-To: apmail-qpid-commits-archive@qpid.apache.org Received: (qmail 73337 invoked by uid 500); 25 Jan 2016 22:10:44 -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 73258 invoked by uid 99); 25 Jan 2016 22:10:44 -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, 25 Jan 2016 22:10:44 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6BF55E0484; Mon, 25 Jan 2016 22:10:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: astitcher@apache.org To: commits@qpid.apache.org Date: Mon, 25 Jan 2016 22:10:48 -0000 Message-Id: <4b7c69c74b9741e9ad941410cd1932f8@git.apache.org> In-Reply-To: <3f0b4c0194b742ce9684867f0d2baf84@git.apache.org> References: <3f0b4c0194b742ce9684867f0d2baf84@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [5/5] qpid-proton git commit: Merge branch 'errors' Merge branch 'errors' Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/195e979f Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/195e979f Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/195e979f Branch: refs/heads/master Commit: 195e979f9c37ffdfd8fb148aab99ed38666fc5c1 Parents: 290bc25 1bcfe66 Author: Andrew Stitcher Authored: Mon Jan 25 17:00:14 2016 -0500 Committer: Andrew Stitcher Committed: Mon Jan 25 17:00:14 2016 -0500 ---------------------------------------------------------------------- examples/cpp/broker.hpp | 2 +- examples/cpp/direct_send.cpp | 2 +- examples/cpp/engine/direct_send.cpp | 2 +- examples/cpp/engine/simple_send.cpp | 2 +- examples/cpp/simple_send.cpp | 2 +- proton-c/bindings/cpp/CMakeLists.txt | 1 + .../bindings/cpp/include/proton/condition.hpp | 57 ++++++++++++++++++ .../bindings/cpp/include/proton/connection.hpp | 12 ++-- .../bindings/cpp/include/proton/endpoint.hpp | 12 ++-- proton-c/bindings/cpp/include/proton/event.hpp | 4 ++ .../bindings/cpp/include/proton/handler.hpp | 11 ++-- proton-c/bindings/cpp/include/proton/link.hpp | 11 +++- .../bindings/cpp/include/proton/session.hpp | 9 ++- .../bindings/cpp/include/proton/transport.hpp | 2 + proton-c/bindings/cpp/src/condition.cpp | 62 ++++++++++++++++++++ proton-c/bindings/cpp/src/connection.cpp | 11 +++- .../bindings/cpp/src/connection_options.cpp | 1 + proton-c/bindings/cpp/src/contexts.cpp | 1 + proton-c/bindings/cpp/src/endpoint.cpp | 3 +- proton-c/bindings/cpp/src/event.cpp | 9 +++ proton-c/bindings/cpp/src/handler.cpp | 30 ++++++---- proton-c/bindings/cpp/src/link.cpp | 11 +++- proton-c/bindings/cpp/src/messaging_adapter.cpp | 48 +++++++-------- proton-c/bindings/cpp/src/messaging_event.cpp | 16 ++++- proton-c/bindings/cpp/src/messaging_event.hpp | 21 ++++--- proton-c/bindings/cpp/src/proton_event.cpp | 15 +++++ proton-c/bindings/cpp/src/proton_event.hpp | 2 + proton-c/bindings/cpp/src/session.cpp | 9 +++ proton-c/bindings/cpp/src/transport.cpp | 5 ++ 29 files changed, 294 insertions(+), 79 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/195e979f/proton-c/bindings/cpp/CMakeLists.txt ---------------------------------------------------------------------- diff --cc proton-c/bindings/cpp/CMakeLists.txt index 7edbe7e,05b6361..85c0458 --- a/proton-c/bindings/cpp/CMakeLists.txt +++ b/proton-c/bindings/cpp/CMakeLists.txt @@@ -27,6 -27,13 +27,7 @@@ include_directories set(qpid-proton-cpp-source src/acceptor.cpp src/scalar.cpp - src/blocking_connection.cpp - src/blocking_connection_impl.cpp - src/blocking_fetcher.cpp - src/blocking_link.cpp - src/blocking_receiver.cpp - src/blocking_sender.cpp + src/condition.cpp src/connection.cpp src/connection_options.cpp src/connector.cpp --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org For additional commands, e-mail: commits-help@qpid.apache.org