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 <[email protected]> Authored: Mon Jan 25 17:00:14 2016 -0500 Committer: Andrew Stitcher <[email protected]> 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: [email protected] For additional commands, e-mail: [email protected]
