Merge branch 'event_tidying' This closes #63
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/3a034abb Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/3a034abb Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/3a034abb Branch: refs/heads/master Commit: 3a034abbdcc167e7744f5fd45696a76657ff75dc Parents: 701e8d0 f6aca30 Author: Andrew Stitcher <[email protected]> Authored: Wed Jan 20 09:53:22 2016 -0500 Committer: Andrew Stitcher <[email protected]> Committed: Wed Jan 20 09:53:22 2016 -0500 ---------------------------------------------------------------------- examples/cpp/broker.cpp | 2 +- examples/cpp/broker.hpp | 7 +- examples/cpp/client.cpp | 5 +- examples/cpp/connection_options.cpp | 7 +- examples/cpp/direct_recv.cpp | 5 +- examples/cpp/direct_send.cpp | 5 +- examples/cpp/helloworld.cpp | 5 +- examples/cpp/helloworld_direct.cpp | 5 +- examples/cpp/queue_browser.cpp | 5 +- examples/cpp/recurring_timer.cpp | 9 +- examples/cpp/selected_recv.cpp | 5 +- examples/cpp/server.cpp | 6 +- examples/cpp/server_direct.cpp | 5 +- examples/cpp/simple_recv.cpp | 5 +- examples/cpp/simple_send.cpp | 5 +- examples/cpp/ssl.cpp | 7 +- examples/cpp/ssl_client_cert.cpp | 7 +- proton-c/bindings/cpp/CMakeLists.txt | 3 +- .../cpp/include/proton/connection_options.hpp | 4 +- .../bindings/cpp/include/proton/container.hpp | 5 +- .../bindings/cpp/include/proton/endpoint.hpp | 1 - proton-c/bindings/cpp/include/proton/event.hpp | 3 - .../bindings/cpp/include/proton/handler.hpp | 93 ++-- proton-c/bindings/cpp/include/proton/link.hpp | 2 +- .../cpp/include/proton/link_options.hpp | 4 +- .../cpp/include/proton/messaging_adapter.hpp | 70 --- .../cpp/include/proton/messaging_handler.hpp | 107 ---- .../cpp/include/proton/proton_handler.hpp | 86 ---- .../cpp/include/proton/request_response.hpp | 2 +- .../bindings/cpp/include/proton/session.hpp | 1 - .../cpp/src/blocking_connection_impl.cpp | 4 +- .../cpp/src/blocking_connection_impl.hpp | 4 +- proton-c/bindings/cpp/src/blocking_fetcher.cpp | 2 +- proton-c/bindings/cpp/src/blocking_fetcher.hpp | 5 +- proton-c/bindings/cpp/src/connection.cpp | 1 - proton-c/bindings/cpp/src/connection_engine.cpp | 17 +- .../bindings/cpp/src/connection_options.cpp | 9 +- proton-c/bindings/cpp/src/connector.cpp | 18 +- proton-c/bindings/cpp/src/connector.hpp | 20 +- proton-c/bindings/cpp/src/container.cpp | 12 +- proton-c/bindings/cpp/src/container_impl.cpp | 45 +- proton-c/bindings/cpp/src/container_impl.hpp | 17 +- proton-c/bindings/cpp/src/contexts.cpp | 4 +- proton-c/bindings/cpp/src/contexts.hpp | 8 +- proton-c/bindings/cpp/src/event.cpp | 1 - proton-c/bindings/cpp/src/handler.cpp | 43 +- proton-c/bindings/cpp/src/link.cpp | 2 +- proton-c/bindings/cpp/src/link_options.cpp | 11 +- proton-c/bindings/cpp/src/messaging_adapter.cpp | 377 +++++++-------- proton-c/bindings/cpp/src/messaging_adapter.hpp | 70 +++ proton-c/bindings/cpp/src/messaging_event.cpp | 94 +--- proton-c/bindings/cpp/src/messaging_event.hpp | 18 +- proton-c/bindings/cpp/src/messaging_handler.cpp | 106 ---- proton-c/bindings/cpp/src/proton_event.cpp | 170 +++---- proton-c/bindings/cpp/src/proton_event.hpp | 484 +++++++++---------- proton-c/bindings/cpp/src/proton_handler.cpp | 92 ++-- proton-c/bindings/cpp/src/proton_handler.hpp | 104 ++++ tests/tools/apps/cpp/reactor_send.cpp | 7 +- 58 files changed, 986 insertions(+), 1235 deletions(-) ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
