Merge branch 'inclusion_fixes'
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/fb5c5d92 Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/fb5c5d92 Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/fb5c5d92 Branch: refs/heads/master Commit: fb5c5d92041862f67c1e2e2443210f0c52ab1a50 Parents: 6b05d01 1a9470a Author: Andrew Stitcher <astitc...@apache.org> Authored: Tue May 17 16:53:00 2016 -0400 Committer: Andrew Stitcher <astitc...@apache.org> Committed: Tue May 17 16:53:00 2016 -0400 ---------------------------------------------------------------------- examples/cpp/broker.cpp | 47 +++++------ examples/cpp/broker.hpp | 46 +++++------ examples/cpp/client.cpp | 20 ++--- examples/cpp/connection_options.cpp | 18 ++--- examples/cpp/direct_recv.cpp | 18 ++--- examples/cpp/direct_send.cpp | 20 ++--- examples/cpp/fake_cpp11.hpp | 34 ++++++++ examples/cpp/flow_control.cpp | 34 ++++---- examples/cpp/helloworld.cpp | 22 ++--- examples/cpp/helloworld_direct.cpp | 22 ++--- examples/cpp/mt/broker.cpp | 22 ++--- examples/cpp/mt/epoll_container.cpp | 20 ++--- examples/cpp/queue_browser.cpp | 20 ++--- examples/cpp/selected_recv.cpp | 18 ++--- examples/cpp/server.cpp | 16 ++-- examples/cpp/server_direct.cpp | 18 ++--- examples/cpp/simple_recv.cpp | 20 ++--- examples/cpp/simple_send.cpp | 20 ++--- examples/cpp/ssl.cpp | 28 +++---- examples/cpp/ssl_client_cert.cpp | 30 +++---- .../cpp/include/proton/annotation_key.hpp | 4 +- proton-c/bindings/cpp/include/proton/binary.hpp | 4 +- .../bindings/cpp/include/proton/byte_array.hpp | 6 +- .../bindings/cpp/include/proton/codec/data.hpp | 6 +- .../cpp/include/proton/codec/decoder.hpp | 6 +- .../bindings/cpp/include/proton/codec/deque.hpp | 4 +- .../cpp/include/proton/codec/encoder.hpp | 6 +- .../cpp/include/proton/codec/forward_list.hpp | 4 +- .../bindings/cpp/include/proton/codec/list.hpp | 4 +- .../bindings/cpp/include/proton/codec/map.hpp | 4 +- .../cpp/include/proton/codec/unordered_map.hpp | 4 +- .../cpp/include/proton/codec/vector.hpp | 4 +- proton-c/bindings/cpp/include/proton/config.hpp | 84 -------------------- .../bindings/cpp/include/proton/connection.hpp | 10 +-- .../cpp/include/proton/connection_options.hpp | 12 +-- .../bindings/cpp/include/proton/container.hpp | 10 +-- .../bindings/cpp/include/proton/decimal.hpp | 8 +- .../cpp/include/proton/default_container.hpp | 2 +- .../bindings/cpp/include/proton/delivery.hpp | 10 +-- .../bindings/cpp/include/proton/duration.hpp | 6 +- .../bindings/cpp/include/proton/endpoint.hpp | 8 +- proton-c/bindings/cpp/include/proton/error.hpp | 6 +- .../cpp/include/proton/error_condition.hpp | 6 +- .../bindings/cpp/include/proton/event_loop.hpp | 2 +- proton-c/bindings/cpp/include/proton/export.hpp | 57 ------------- .../cpp/include/proton/internal/config.hpp | 84 ++++++++++++++++++++ .../cpp/include/proton/internal/export.hpp | 57 +++++++++++++ .../cpp/include/proton/internal/object.hpp | 6 +- .../include/proton/internal/pn_unique_ptr.hpp | 2 +- .../cpp/include/proton/internal/scalar_base.hpp | 22 ++--- .../cpp/include/proton/internal/type_traits.hpp | 6 +- .../cpp/include/proton/io/connection_engine.hpp | 18 ++--- .../include/proton/io/container_impl_base.hpp | 4 +- proton-c/bindings/cpp/include/proton/link.hpp | 20 ++--- .../bindings/cpp/include/proton/listener.hpp | 2 +- .../bindings/cpp/include/proton/message.hpp | 14 ++-- .../bindings/cpp/include/proton/message_id.hpp | 6 +- .../cpp/include/proton/messaging_handler.hpp | 4 +- .../bindings/cpp/include/proton/receiver.hpp | 9 ++- .../cpp/include/proton/receiver_options.hpp | 12 +-- .../cpp/include/proton/reconnect_timer.hpp | 8 +- proton-c/bindings/cpp/include/proton/sasl.hpp | 8 +- proton-c/bindings/cpp/include/proton/scalar.hpp | 2 +- proton-c/bindings/cpp/include/proton/sender.hpp | 10 +-- .../cpp/include/proton/sender_options.hpp | 12 +-- .../bindings/cpp/include/proton/session.hpp | 16 ++-- .../cpp/include/proton/session_options.hpp | 8 +- proton-c/bindings/cpp/include/proton/source.hpp | 10 +-- .../cpp/include/proton/source_options.hpp | 12 +-- proton-c/bindings/cpp/include/proton/ssl.hpp | 6 +- proton-c/bindings/cpp/include/proton/target.hpp | 8 +- .../cpp/include/proton/target_options.hpp | 14 ++-- proton-c/bindings/cpp/include/proton/task.hpp | 6 +- .../bindings/cpp/include/proton/terminus.hpp | 8 +- .../bindings/cpp/include/proton/thread_safe.hpp | 10 +-- .../bindings/cpp/include/proton/timestamp.hpp | 2 +- .../bindings/cpp/include/proton/tracker.hpp | 4 +- .../bindings/cpp/include/proton/transfer.hpp | 8 +- .../bindings/cpp/include/proton/transport.hpp | 6 +- .../bindings/cpp/include/proton/type_id.hpp | 4 +- proton-c/bindings/cpp/include/proton/types.hpp | 38 ++++----- .../bindings/cpp/include/proton/types_fwd.hpp | 4 +- proton-c/bindings/cpp/include/proton/url.hpp | 4 +- proton-c/bindings/cpp/include/proton/uuid.hpp | 4 +- proton-c/bindings/cpp/include/proton/value.hpp | 8 +- proton-c/bindings/cpp/src/acceptor.hpp | 4 +- proton-c/bindings/cpp/src/binary.cpp | 2 +- proton-c/bindings/cpp/src/byte_array.cpp | 2 +- proton-c/bindings/cpp/src/codec_test.cpp | 6 +- proton-c/bindings/cpp/src/connection.cpp | 10 +-- .../bindings/cpp/src/connection_options.cpp | 4 +- proton-c/bindings/cpp/src/connector.cpp | 4 +- proton-c/bindings/cpp/src/connector.hpp | 4 +- proton-c/bindings/cpp/src/container.cpp | 4 +- proton-c/bindings/cpp/src/container_impl.cpp | 8 +- proton-c/bindings/cpp/src/container_impl.hpp | 3 +- proton-c/bindings/cpp/src/contexts.cpp | 12 +-- proton-c/bindings/cpp/src/data.cpp | 16 ++-- proton-c/bindings/cpp/src/decoder.cpp | 20 ++--- proton-c/bindings/cpp/src/encoder.cpp | 20 ++--- proton-c/bindings/cpp/src/endpoint.cpp | 6 +- proton-c/bindings/cpp/src/engine_test.cpp | 14 ++-- proton-c/bindings/cpp/src/error_condition.cpp | 2 +- proton-c/bindings/cpp/src/event_loop.cpp | 2 +- proton-c/bindings/cpp/src/handler.cpp | 2 +- proton-c/bindings/cpp/src/link.cpp | 6 +- proton-c/bindings/cpp/src/message.cpp | 2 +- proton-c/bindings/cpp/src/messaging_adapter.cpp | 14 ++-- proton-c/bindings/cpp/src/messaging_adapter.hpp | 4 +- proton-c/bindings/cpp/src/proton_event.hpp | 2 +- proton-c/bindings/cpp/src/proton_handler.hpp | 1 - proton-c/bindings/cpp/src/receiver.cpp | 10 +-- proton-c/bindings/cpp/src/receiver_options.cpp | 2 +- proton-c/bindings/cpp/src/reconnect_timer.cpp | 4 +- proton-c/bindings/cpp/src/scalar_test.cpp | 10 +-- proton-c/bindings/cpp/src/sender.cpp | 6 +- proton-c/bindings/cpp/src/session.cpp | 4 +- proton-c/bindings/cpp/src/session_options.cpp | 2 +- proton-c/bindings/cpp/src/ssl.cpp | 2 +- proton-c/bindings/cpp/src/ssl_domain.cpp | 2 +- proton-c/bindings/cpp/src/task.cpp | 2 +- proton-c/bindings/cpp/src/terminus.cpp | 2 +- proton-c/bindings/cpp/src/test_bits.hpp | 2 +- proton-c/bindings/cpp/src/timestamp.cpp | 2 +- proton-c/bindings/cpp/src/transfer.cpp | 6 +- proton-c/bindings/cpp/src/transport.cpp | 4 +- proton-c/bindings/cpp/src/type_id.cpp | 2 +- proton-c/bindings/cpp/src/types_internal.hpp | 6 +- proton-c/bindings/cpp/src/url.cpp | 2 +- proton-c/bindings/cpp/src/uuid.cpp | 4 +- proton-c/bindings/cpp/src/value_test.cpp | 4 +- 131 files changed, 773 insertions(+), 735 deletions(-) ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
