Repository: qpid-proton Updated Branches: refs/heads/master 6b05d0107 -> fb5c5d920
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/include/proton/io/container_impl_base.hpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/include/proton/io/container_impl_base.hpp b/proton-c/bindings/cpp/include/proton/io/container_impl_base.hpp index 858102e..313e675 100644 --- a/proton-c/bindings/cpp/include/proton/io/container_impl_base.hpp +++ b/proton-c/bindings/cpp/include/proton/io/container_impl_base.hpp @@ -22,8 +22,8 @@ * */ -#include "proton/io/link_namer.hpp" -#include "proton/container.hpp" +#include "./link_namer.hpp" +#include "../container.hpp" #include <mutex> #include <sstream> http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/include/proton/link.hpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/include/proton/link.hpp b/proton-c/bindings/cpp/include/proton/link.hpp index 6eca93e..a9fb336 100644 --- a/proton-c/bindings/cpp/include/proton/link.hpp +++ b/proton-c/bindings/cpp/include/proton/link.hpp @@ -22,16 +22,16 @@ * */ -#include "proton/endpoint.hpp" -#include "proton/export.hpp" -#include "proton/message.hpp" -#include "proton/source.hpp" -#include "proton/target.hpp" -#include "proton/internal/object.hpp" -#include "proton/sender_options.hpp" -#include "proton/receiver_options.hpp" - -#include "proton/types.h" +#include "./endpoint.hpp" +#include "./internal/export.hpp" +#include "./message.hpp" +#include "./source.hpp" +#include "./target.hpp" +#include "./internal/object.hpp" +#include "./sender_options.hpp" +#include "./receiver_options.hpp" + +#include <proton/types.h> #include <string> http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/include/proton/listener.hpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/include/proton/listener.hpp b/proton-c/bindings/cpp/include/proton/listener.hpp index 0cdd7a5..2cdf121 100644 --- a/proton-c/bindings/cpp/include/proton/listener.hpp +++ b/proton-c/bindings/cpp/include/proton/listener.hpp @@ -20,7 +20,7 @@ * under the License. */ -#include "proton/export.hpp" +#include "./internal/export.hpp" #include <string> http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/include/proton/message.hpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/include/proton/message.hpp b/proton-c/bindings/cpp/include/proton/message.hpp index a6bc215..754b39f 100644 --- a/proton-c/bindings/cpp/include/proton/message.hpp +++ b/proton-c/bindings/cpp/include/proton/message.hpp @@ -22,13 +22,13 @@ * */ -#include "proton/annotation_key.hpp" -#include "proton/codec/map.hpp" -#include "proton/duration.hpp" -#include "proton/export.hpp" -#include "proton/message_id.hpp" -#include "proton/internal/pn_unique_ptr.hpp" -#include "proton/value.hpp" +#include "./annotation_key.hpp" +#include "./codec/map.hpp" +#include "./duration.hpp" +#include "./internal/export.hpp" +#include "./message_id.hpp" +#include "./internal/pn_unique_ptr.hpp" +#include "./value.hpp" #include <string> #include <vector> http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/include/proton/message_id.hpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/include/proton/message_id.hpp b/proton-c/bindings/cpp/include/proton/message_id.hpp index 59b6f75..a37198e 100644 --- a/proton-c/bindings/cpp/include/proton/message_id.hpp +++ b/proton-c/bindings/cpp/include/proton/message_id.hpp @@ -22,9 +22,9 @@ * */ -#include "proton/binary.hpp" -#include "proton/internal/scalar_base.hpp" -#include "proton/uuid.hpp" +#include "./binary.hpp" +#include "./internal/scalar_base.hpp" +#include "./uuid.hpp" #include <string> http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/include/proton/messaging_handler.hpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/include/proton/messaging_handler.hpp b/proton-c/bindings/cpp/include/proton/messaging_handler.hpp index b6e4b12..04f7c11 100644 --- a/proton-c/bindings/cpp/include/proton/messaging_handler.hpp +++ b/proton-c/bindings/cpp/include/proton/messaging_handler.hpp @@ -22,8 +22,8 @@ * */ -#include "proton/export.hpp" -#include "proton/internal/pn_unique_ptr.hpp" +#include "./internal/export.hpp" +#include "./internal/pn_unique_ptr.hpp" namespace proton { http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/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 3a3b69b..ebb1391 100644 --- a/proton-c/bindings/cpp/include/proton/receiver.hpp +++ b/proton-c/bindings/cpp/include/proton/receiver.hpp @@ -22,10 +22,11 @@ * */ -#include "proton/export.hpp" -#include "proton/endpoint.hpp" -#include "proton/link.hpp" -#include "proton/types.h" +#include "./internal/export.hpp" +#include "./endpoint.hpp" +#include "./link.hpp" + +#include <proton/types.h> #include <string> http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/include/proton/receiver_options.hpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/include/proton/receiver_options.hpp b/proton-c/bindings/cpp/include/proton/receiver_options.hpp index 39d40f7..7b1b511 100644 --- a/proton-c/bindings/cpp/include/proton/receiver_options.hpp +++ b/proton-c/bindings/cpp/include/proton/receiver_options.hpp @@ -22,12 +22,12 @@ * */ -#include "proton/config.hpp" -#include "proton/export.hpp" -#include "proton/internal/pn_unique_ptr.hpp" -#include "proton/types.hpp" -#include "proton/delivery_mode.hpp" -#include "proton/terminus.hpp" +#include "./internal/config.hpp" +#include "./internal/export.hpp" +#include "./internal/pn_unique_ptr.hpp" +#include "./types.hpp" +#include "./delivery_mode.hpp" +#include "./terminus.hpp" #include <vector> #include <string> http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/include/proton/reconnect_timer.hpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/include/proton/reconnect_timer.hpp b/proton-c/bindings/cpp/include/proton/reconnect_timer.hpp index 8ac157d..66ec6b0 100644 --- a/proton-c/bindings/cpp/include/proton/reconnect_timer.hpp +++ b/proton-c/bindings/cpp/include/proton/reconnect_timer.hpp @@ -25,10 +25,10 @@ /// @cond INTERNAL /// XXX Needs more discussion -#include "proton/export.hpp" -#include "proton/duration.hpp" -#include "proton/timestamp.hpp" -#include "proton/types.hpp" +#include "./internal/export.hpp" +#include "./duration.hpp" +#include "./timestamp.hpp" +#include "./types.hpp" #include <string> http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/include/proton/sasl.hpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/include/proton/sasl.hpp b/proton-c/bindings/cpp/include/proton/sasl.hpp index 0359c99..137aa28 100644 --- a/proton-c/bindings/cpp/include/proton/sasl.hpp +++ b/proton-c/bindings/cpp/include/proton/sasl.hpp @@ -22,11 +22,11 @@ * */ -#include "proton/export.hpp" -#include "proton/config.hpp" -#include "proton/internal/object.hpp" +#include "./internal/export.hpp" +#include "./internal/config.hpp" +#include "./internal/object.hpp" -#include "proton/sasl.h" +#include <proton/sasl.h> #include <string> http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/include/proton/scalar.hpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/include/proton/scalar.hpp b/proton-c/bindings/cpp/include/proton/scalar.hpp index 2aa73b9..4fd6dd9 100644 --- a/proton-c/bindings/cpp/include/proton/scalar.hpp +++ b/proton-c/bindings/cpp/include/proton/scalar.hpp @@ -20,7 +20,7 @@ * under the License. */ -#include "proton/internal/scalar_base.hpp" +#include "./internal/scalar_base.hpp" namespace proton { http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/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 1944e36..b422fec 100644 --- a/proton-c/bindings/cpp/include/proton/sender.hpp +++ b/proton-c/bindings/cpp/include/proton/sender.hpp @@ -22,12 +22,12 @@ * */ -#include "proton/export.hpp" -#include "proton/link.hpp" -#include "proton/message.hpp" -#include "proton/tracker.hpp" +#include "./internal/export.hpp" +#include "./link.hpp" +#include "./message.hpp" +#include "./tracker.hpp" -#include "proton/types.h" +#include <proton/types.h> #include <string> http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/include/proton/sender_options.hpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/include/proton/sender_options.hpp b/proton-c/bindings/cpp/include/proton/sender_options.hpp index 0a2e4e0..64fea2f 100644 --- a/proton-c/bindings/cpp/include/proton/sender_options.hpp +++ b/proton-c/bindings/cpp/include/proton/sender_options.hpp @@ -22,12 +22,12 @@ * */ -#include "proton/config.hpp" -#include "proton/export.hpp" -#include "proton/internal/pn_unique_ptr.hpp" -#include "proton/types.hpp" -#include "proton/delivery_mode.hpp" -#include "proton/terminus.hpp" +#include "./internal/config.hpp" +#include "./internal/export.hpp" +#include "./internal/pn_unique_ptr.hpp" +#include "./types.hpp" +#include "./delivery_mode.hpp" +#include "./terminus.hpp" #include <vector> #include <string> http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/include/proton/session.hpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/include/proton/session.hpp b/proton-c/bindings/cpp/include/proton/session.hpp index 1814b95..5053f4c 100644 --- a/proton-c/bindings/cpp/include/proton/session.hpp +++ b/proton-c/bindings/cpp/include/proton/session.hpp @@ -22,14 +22,14 @@ * */ -#include "proton/export.hpp" -#include "proton/endpoint.hpp" -#include "proton/receiver.hpp" -#include "proton/sender.hpp" -#include "proton/session_options.hpp" - -#include "proton/types.h" -#include "proton/link.h" +#include "./internal/export.hpp" +#include "./endpoint.hpp" +#include "./receiver.hpp" +#include "./sender.hpp" +#include "./session_options.hpp" + +#include <proton/types.h> +#include <proton/link.h> #include <string> http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/include/proton/session_options.hpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/include/proton/session_options.hpp b/proton-c/bindings/cpp/include/proton/session_options.hpp index 7b7565b..059afb5 100644 --- a/proton-c/bindings/cpp/include/proton/session_options.hpp +++ b/proton-c/bindings/cpp/include/proton/session_options.hpp @@ -22,10 +22,10 @@ * */ -#include "proton/config.hpp" -#include "proton/export.hpp" -#include "proton/internal/pn_unique_ptr.hpp" -#include "proton/types.hpp" +#include "./internal/config.hpp" +#include "./internal/export.hpp" +#include "./internal/pn_unique_ptr.hpp" +#include "./types.hpp" namespace proton { http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/include/proton/source.hpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/include/proton/source.hpp b/proton-c/bindings/cpp/include/proton/source.hpp index 7546f7d..0c0998c 100644 --- a/proton-c/bindings/cpp/include/proton/source.hpp +++ b/proton-c/bindings/cpp/include/proton/source.hpp @@ -22,11 +22,11 @@ * */ -#include "proton/export.hpp" -#include "proton/internal/object.hpp" -#include "proton/value.hpp" -#include "proton/terminus.hpp" -#include "proton/codec/map.hpp" +#include "./internal/export.hpp" +#include "./internal/object.hpp" +#include "./value.hpp" +#include "./terminus.hpp" +#include "./codec/map.hpp" #include <string> http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/include/proton/source_options.hpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/include/proton/source_options.hpp b/proton-c/bindings/cpp/include/proton/source_options.hpp index 3738184..d530990 100644 --- a/proton-c/bindings/cpp/include/proton/source_options.hpp +++ b/proton-c/bindings/cpp/include/proton/source_options.hpp @@ -22,12 +22,12 @@ * */ -#include "proton/config.hpp" -#include "proton/export.hpp" -#include "proton/internal/pn_unique_ptr.hpp" -#include "proton/types.hpp" -#include "proton/delivery_mode.hpp" -#include "proton/source.hpp" +#include "./internal/config.hpp" +#include "./internal/export.hpp" +#include "./internal/pn_unique_ptr.hpp" +#include "./types.hpp" +#include "./delivery_mode.hpp" +#include "./source.hpp" #include <vector> #include <string> http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/include/proton/ssl.hpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/include/proton/ssl.hpp b/proton-c/bindings/cpp/include/proton/ssl.hpp index b6e3917..b7f2d17 100644 --- a/proton-c/bindings/cpp/include/proton/ssl.hpp +++ b/proton-c/bindings/cpp/include/proton/ssl.hpp @@ -22,10 +22,10 @@ * */ -#include "proton/export.hpp" -#include "proton/internal/object.hpp" +#include "./internal/export.hpp" +#include "./internal/object.hpp" -#include "proton/ssl.h" +#include <proton/ssl.h> #include <string> http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/include/proton/target.hpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/include/proton/target.hpp b/proton-c/bindings/cpp/include/proton/target.hpp index 096d805..27be9f2 100644 --- a/proton-c/bindings/cpp/include/proton/target.hpp +++ b/proton-c/bindings/cpp/include/proton/target.hpp @@ -22,10 +22,10 @@ * */ -#include "proton/export.hpp" -#include "proton/internal/object.hpp" -#include "proton/value.hpp" -#include "proton/terminus.hpp" +#include "./internal/export.hpp" +#include "./internal/object.hpp" +#include "./value.hpp" +#include "./terminus.hpp" #include <string> http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/include/proton/target_options.hpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/include/proton/target_options.hpp b/proton-c/bindings/cpp/include/proton/target_options.hpp index 739f38d..e4fa2f6 100644 --- a/proton-c/bindings/cpp/include/proton/target_options.hpp +++ b/proton-c/bindings/cpp/include/proton/target_options.hpp @@ -22,13 +22,13 @@ * */ -#include "proton/config.hpp" -#include "proton/export.hpp" -#include "proton/internal/pn_unique_ptr.hpp" -#include "proton/types.hpp" -#include "proton/delivery_mode.hpp" -#include "proton/target.hpp" -#include "proton/terminus.hpp" +#include "./internal/config.hpp" +#include "./internal/export.hpp" +#include "./internal/pn_unique_ptr.hpp" +#include "./types.hpp" +#include "./delivery_mode.hpp" +#include "./target.hpp" +#include "./terminus.hpp" #include <vector> #include <string> http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/include/proton/task.hpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/include/proton/task.hpp b/proton-c/bindings/cpp/include/proton/task.hpp index cd3ac84..c13d7ad 100644 --- a/proton-c/bindings/cpp/include/proton/task.hpp +++ b/proton-c/bindings/cpp/include/proton/task.hpp @@ -25,10 +25,10 @@ /// @cond INTERNAL /// XXX Needs more discussion -#include "proton/export.hpp" -#include "proton/internal/object.hpp" +#include "./internal/export.hpp" +#include "./internal/object.hpp" -#include "proton/reactor.h" +#include <proton/reactor.h> namespace proton { http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/include/proton/terminus.hpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/include/proton/terminus.hpp b/proton-c/bindings/cpp/include/proton/terminus.hpp index 403df0a..6c10486 100644 --- a/proton-c/bindings/cpp/include/proton/terminus.hpp +++ b/proton-c/bindings/cpp/include/proton/terminus.hpp @@ -22,11 +22,11 @@ * */ -#include "proton/export.hpp" -#include "proton/internal/object.hpp" -#include "proton/value.hpp" +#include "./internal/export.hpp" +#include "./internal/object.hpp" +#include "./value.hpp" -#include "proton/link.h" +#include <proton/link.h> #include <string> namespace proton { http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/include/proton/thread_safe.hpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/include/proton/thread_safe.hpp b/proton-c/bindings/cpp/include/proton/thread_safe.hpp index 1da669c..9925fc7 100644 --- a/proton-c/bindings/cpp/include/proton/thread_safe.hpp +++ b/proton-c/bindings/cpp/include/proton/thread_safe.hpp @@ -22,11 +22,11 @@ * */ -#include "proton/config.hpp" -#include "proton/connection.hpp" -#include "proton/event_loop.hpp" -#include "proton/internal/object.hpp" -#include "proton/internal/type_traits.hpp" +#include "./internal/config.hpp" +#include "./connection.hpp" +#include "./event_loop.hpp" +#include "./internal/object.hpp" +#include "./internal/type_traits.hpp" #include <functional> http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/include/proton/timestamp.hpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/include/proton/timestamp.hpp b/proton-c/bindings/cpp/include/proton/timestamp.hpp index 01c317d..c0de3e5 100644 --- a/proton-c/bindings/cpp/include/proton/timestamp.hpp +++ b/proton-c/bindings/cpp/include/proton/timestamp.hpp @@ -20,7 +20,7 @@ * under the License. */ -#include "proton/duration.hpp" +#include "./duration.hpp" namespace proton { http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/include/proton/tracker.hpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/include/proton/tracker.hpp b/proton-c/bindings/cpp/include/proton/tracker.hpp index e6f7c5d..408b04d 100644 --- a/proton-c/bindings/cpp/include/proton/tracker.hpp +++ b/proton-c/bindings/cpp/include/proton/tracker.hpp @@ -22,8 +22,8 @@ * */ -#include "proton/export.hpp" -#include "proton/transfer.hpp" +#include "./internal/export.hpp" +#include "./transfer.hpp" struct pn_delivery_t; http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/include/proton/transfer.hpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/include/proton/transfer.hpp b/proton-c/bindings/cpp/include/proton/transfer.hpp index fcbe3c6..d9f38a9 100644 --- a/proton-c/bindings/cpp/include/proton/transfer.hpp +++ b/proton-c/bindings/cpp/include/proton/transfer.hpp @@ -22,11 +22,11 @@ * */ -#include "proton/export.hpp" -#include "proton/internal/object.hpp" +#include "./internal/export.hpp" +#include "./internal/object.hpp" -#include "proton/delivery.h" -#include "proton/disposition.h" +#include <proton/delivery.h> +#include <proton/disposition.h> namespace proton { http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/include/proton/transport.hpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/include/proton/transport.hpp b/proton-c/bindings/cpp/include/proton/transport.hpp index fb704ba..bcd8a2f 100644 --- a/proton-c/bindings/cpp/include/proton/transport.hpp +++ b/proton-c/bindings/cpp/include/proton/transport.hpp @@ -22,9 +22,9 @@ * */ -#include "proton/internal/object.hpp" -#include "proton/types.hpp" -#include "proton/export.hpp" +#include "./internal/object.hpp" +#include "./types.hpp" +#include "./internal/export.hpp" struct pn_transport_t; http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/include/proton/type_id.hpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/include/proton/type_id.hpp b/proton-c/bindings/cpp/include/proton/type_id.hpp index 711100f..4460eb6 100644 --- a/proton-c/bindings/cpp/include/proton/type_id.hpp +++ b/proton-c/bindings/cpp/include/proton/type_id.hpp @@ -26,9 +26,9 @@ /// /// Type-identifiers for AMQP types. -#include "proton/export.hpp" +#include "./internal/export.hpp" -#include "proton/codec.h" +#include <proton/codec.h> #include <string> http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/include/proton/types.hpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/include/proton/types.hpp b/proton-c/bindings/cpp/include/proton/types.hpp index 08a4d05..5aa52fd 100644 --- a/proton-c/bindings/cpp/include/proton/types.hpp +++ b/proton-c/bindings/cpp/include/proton/types.hpp @@ -29,27 +29,27 @@ // TODO aconway 2016-03-15: described types, described arrays. -#include "proton/annotation_key.hpp" -#include "proton/binary.hpp" -#include "proton/codec/deque.hpp" -#include "proton/codec/list.hpp" -#include "proton/codec/map.hpp" -#include "proton/codec/vector.hpp" -#include "proton/config.hpp" -#include "proton/decimal.hpp" -#include "proton/duration.hpp" -#include "proton/message_id.hpp" -#include "proton/scalar.hpp" -#include "proton/symbol.hpp" -#include "proton/timestamp.hpp" -#include "proton/types_fwd.hpp" -#include "proton/uuid.hpp" -#include "proton/value.hpp" -#include "proton/config.hpp" +#include "./annotation_key.hpp" +#include "./binary.hpp" +#include "./codec/deque.hpp" +#include "./codec/list.hpp" +#include "./codec/map.hpp" +#include "./codec/vector.hpp" +#include "./internal/config.hpp" +#include "./decimal.hpp" +#include "./duration.hpp" +#include "./message_id.hpp" +#include "./scalar.hpp" +#include "./symbol.hpp" +#include "./timestamp.hpp" +#include "./types_fwd.hpp" +#include "./uuid.hpp" +#include "./value.hpp" +#include "./internal/config.hpp" #if PN_CPP_HAS_CPP11 -#include "proton/forward_list.hpp" -#include "proton/unordered_map.hpp" +#include "./codec/forward_list.hpp" +#include "./codec/unordered_map.hpp" #endif #endif // PROTON_TYPES_HPP http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/include/proton/types_fwd.hpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/include/proton/types_fwd.hpp b/proton-c/bindings/cpp/include/proton/types_fwd.hpp index f850049..ec35c87 100644 --- a/proton-c/bindings/cpp/include/proton/types_fwd.hpp +++ b/proton-c/bindings/cpp/include/proton/types_fwd.hpp @@ -27,9 +27,9 @@ /// Forward declarations for all the C++ types used by Proton to /// represent AMQP types. -#include "proton/config.hpp" +#include "./internal/config.hpp" -#include "proton/type_compat.h" +#include <proton/type_compat.h> #include <string> http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/include/proton/url.hpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/include/proton/url.hpp b/proton-c/bindings/cpp/include/proton/url.hpp index bb21b68..0fabe1e 100644 --- a/proton-c/bindings/cpp/include/proton/url.hpp +++ b/proton-c/bindings/cpp/include/proton/url.hpp @@ -22,8 +22,8 @@ * */ -#include "proton/types_fwd.hpp" -#include "proton/error.hpp" +#include "./types_fwd.hpp" +#include "./error.hpp" #include <iosfwd> http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/include/proton/uuid.hpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/include/proton/uuid.hpp b/proton-c/bindings/cpp/include/proton/uuid.hpp index b69f914..6f3bb1c 100644 --- a/proton-c/bindings/cpp/include/proton/uuid.hpp +++ b/proton-c/bindings/cpp/include/proton/uuid.hpp @@ -22,8 +22,8 @@ * */ -#include "proton/byte_array.hpp" -#include "proton/export.hpp" +#include "./byte_array.hpp" +#include "./internal/export.hpp" #include <string> #include <iosfwd> http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/include/proton/value.hpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/include/proton/value.hpp b/proton-c/bindings/cpp/include/proton/value.hpp index 3741972..2e8b302 100644 --- a/proton-c/bindings/cpp/include/proton/value.hpp +++ b/proton-c/bindings/cpp/include/proton/value.hpp @@ -22,10 +22,10 @@ * */ -#include "proton/codec/encoder.hpp" -#include "proton/codec/decoder.hpp" -#include "proton/internal/type_traits.hpp" -#include "proton/types_fwd.hpp" +#include "./codec/encoder.hpp" +#include "./codec/decoder.hpp" +#include "./internal/type_traits.hpp" +#include "./types_fwd.hpp" #include <iosfwd> http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/src/acceptor.hpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/src/acceptor.hpp b/proton-c/bindings/cpp/src/acceptor.hpp index 82f2f5c..9a25592 100644 --- a/proton-c/bindings/cpp/src/acceptor.hpp +++ b/proton-c/bindings/cpp/src/acceptor.hpp @@ -22,10 +22,10 @@ * */ -#include "proton/export.hpp" +#include "proton/internal/export.hpp" #include "proton/internal/object.hpp" -#include "proton/reactor.h" +#include <proton/reactor.h> struct pn_acceptor_t; http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/src/binary.cpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/src/binary.cpp b/proton-c/bindings/cpp/src/binary.cpp index f854935..fb366f0 100644 --- a/proton-c/bindings/cpp/src/binary.cpp +++ b/proton-c/bindings/cpp/src/binary.cpp @@ -19,7 +19,7 @@ #include "types_internal.hpp" -#include <proton/binary.hpp> +#include "proton/binary.hpp" #include <ostream> #include <iomanip> http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/src/byte_array.cpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/src/byte_array.cpp b/proton-c/bindings/cpp/src/byte_array.cpp index b5ffbac..cd6bb1b 100644 --- a/proton-c/bindings/cpp/src/byte_array.cpp +++ b/proton-c/bindings/cpp/src/byte_array.cpp @@ -20,7 +20,7 @@ #include "types_internal.hpp" -#include <proton/byte_array.hpp> +#include "proton/byte_array.hpp" #include <ostream> #include <iomanip> http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/src/codec_test.cpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/src/codec_test.cpp b/proton-c/bindings/cpp/src/codec_test.cpp index 3aa7541..5b8d560 100644 --- a/proton-c/bindings/cpp/src/codec_test.cpp +++ b/proton-c/bindings/cpp/src/codec_test.cpp @@ -19,9 +19,9 @@ #include "test_bits.hpp" -#include <proton/types.hpp> -#include <proton/codec/data.hpp> -#include <proton/config.hpp> +#include "proton/codec/data.hpp" +#include "proton/internal/config.hpp" +#include "proton/types.hpp" namespace { http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/src/connection.cpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/src/connection.cpp b/proton-c/bindings/cpp/src/connection.cpp index 6bab1a1..9219517 100644 --- a/proton-c/bindings/cpp/src/connection.cpp +++ b/proton-c/bindings/cpp/src/connection.cpp @@ -34,11 +34,11 @@ #include "msg.hpp" #include "proton_bits.hpp" -#include "proton/connection.h" -#include "proton/session.h" -#include "proton/transport.h" -#include "proton/reactor.h" -#include "proton/object.h" +#include <proton/connection.h> +#include <proton/session.h> +#include <proton/transport.h> +#include <proton/reactor.h> +#include <proton/object.h> namespace proton { http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/src/connection_options.cpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/src/connection_options.cpp b/proton-c/bindings/cpp/src/connection_options.cpp index 3087f4b..c7a8a27 100644 --- a/proton-c/bindings/cpp/src/connection_options.cpp +++ b/proton-c/bindings/cpp/src/connection_options.cpp @@ -32,8 +32,8 @@ #include "msg.hpp" #include "proton_bits.hpp" -#include "proton/connection.h" -#include "proton/transport.h" +#include <proton/connection.h> +#include <proton/transport.h> namespace proton { http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/src/connector.cpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/src/connector.cpp b/proton-c/bindings/cpp/src/connector.cpp index 7b46f7e..c03826c 100644 --- a/proton-c/bindings/cpp/src/connector.cpp +++ b/proton-c/bindings/cpp/src/connector.cpp @@ -34,8 +34,8 @@ #include "proton_bits.hpp" #include "proton_event.hpp" -#include "proton/connection.h" -#include "proton/transport.h" +#include <proton/connection.h> +#include <proton/transport.h> namespace proton { http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/src/connector.hpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/src/connector.hpp b/proton-c/bindings/cpp/src/connector.hpp index 9449cd1..0970ed6 100644 --- a/proton-c/bindings/cpp/src/connector.hpp +++ b/proton-c/bindings/cpp/src/connector.hpp @@ -24,8 +24,8 @@ #include "proton/connection.hpp" #include "proton/connection_options.hpp" -#include "proton/event.h" -#include "proton/reactor.h" +#include <proton/event.h> +#include <proton/reactor.h> #include "proton/url.hpp" #include "proton_handler.hpp" http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/src/container.cpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/src/container.cpp b/proton-c/bindings/cpp/src/container.cpp index 2da2353..e1ed5b2 100644 --- a/proton-c/bindings/cpp/src/container.cpp +++ b/proton-c/bindings/cpp/src/container.cpp @@ -39,8 +39,8 @@ #include "contexts.hpp" #include "messaging_adapter.hpp" -#include "proton/connection.h" -#include "proton/session.h" +#include <proton/connection.h> +#include <proton/session.h> namespace proton { http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/src/container_impl.cpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/src/container_impl.cpp b/proton-c/bindings/cpp/src/container_impl.cpp index 6fed9c4..23734e8 100644 --- a/proton-c/bindings/cpp/src/container_impl.cpp +++ b/proton-c/bindings/cpp/src/container_impl.cpp @@ -42,10 +42,10 @@ #include "proton_bits.hpp" #include "proton_event.hpp" -#include "proton/connection.h" -#include "proton/session.h" -#include "proton/handlers.h" -#include "proton/reactor.h" +#include <proton/connection.h> +#include <proton/session.h> +#include <proton/handlers.h> +#include <proton/reactor.h> namespace proton { http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/src/container_impl.hpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/src/container_impl.hpp b/proton-c/bindings/cpp/src/container_impl.hpp index db60a84..8fd64d0 100644 --- a/proton-c/bindings/cpp/src/container_impl.hpp +++ b/proton-c/bindings/cpp/src/container_impl.hpp @@ -28,11 +28,10 @@ #include "proton/connection.hpp" #include "proton/connection_options.hpp" #include "proton/duration.hpp" -#include "proton/export.hpp" #include "proton/messaging_handler.hpp" #include "proton/sender.hpp" #include "proton/receiver.hpp" -#include "proton/reactor.h" +#include <proton/reactor.h> #include "reactor.hpp" #include "proton_handler.hpp" http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/src/contexts.cpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/src/contexts.cpp b/proton-c/bindings/cpp/src/contexts.cpp index c70db01..697df66 100644 --- a/proton-c/bindings/cpp/src/contexts.cpp +++ b/proton-c/bindings/cpp/src/contexts.cpp @@ -26,12 +26,12 @@ #include "proton/error.hpp" -#include "proton/connection.h" -#include "proton/object.h" -#include "proton/link.h" -#include "proton/message.h" -#include "proton/reactor.h" -#include "proton/session.h" +#include <proton/connection.h> +#include <proton/object.h> +#include <proton/link.h> +#include <proton/message.h> +#include <proton/reactor.h> +#include <proton/session.h> #include <typeinfo> http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/src/data.cpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/src/data.cpp b/proton-c/bindings/cpp/src/data.cpp index e4b71dd..43f2e5c 100644 --- a/proton-c/bindings/cpp/src/data.cpp +++ b/proton-c/bindings/cpp/src/data.cpp @@ -19,14 +19,14 @@ #include "proton_bits.hpp" -#include <proton/binary.hpp> -#include <proton/codec/encoder.hpp> -#include <proton/codec/data.hpp> -#include <proton/decimal.hpp> -#include <proton/message_id.hpp> -#include <proton/symbol.hpp> -#include <proton/timestamp.hpp> -#include <proton/value.hpp> +#include "proton/binary.hpp" +#include "proton/codec/encoder.hpp" +#include "proton/codec/data.hpp" +#include "proton/decimal.hpp" +#include "proton/message_id.hpp" +#include "proton/symbol.hpp" +#include "proton/timestamp.hpp" +#include "proton/value.hpp" #include <proton/codec.h> http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/src/decoder.cpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/src/decoder.cpp b/proton-c/bindings/cpp/src/decoder.cpp index fa7055e..d42af54 100644 --- a/proton-c/bindings/cpp/src/decoder.cpp +++ b/proton-c/bindings/cpp/src/decoder.cpp @@ -17,16 +17,16 @@ * under the License. */ -#include <proton/annotation_key.hpp> -#include <proton/binary.hpp> -#include <proton/codec/encoder.hpp> -#include <proton/codec/data.hpp> -#include <proton/decimal.hpp> -#include <proton/message_id.hpp> -#include <proton/scalar.hpp> -#include <proton/symbol.hpp> -#include <proton/timestamp.hpp> -#include <proton/value.hpp> +#include "proton/annotation_key.hpp" +#include "proton/binary.hpp" +#include "proton/codec/encoder.hpp" +#include "proton/codec/data.hpp" +#include "proton/decimal.hpp" +#include "proton/message_id.hpp" +#include "proton/scalar.hpp" +#include "proton/symbol.hpp" +#include "proton/timestamp.hpp" +#include "proton/value.hpp" #include "proton_bits.hpp" #include "types_internal.hpp" http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/src/encoder.cpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/src/encoder.cpp b/proton-c/bindings/cpp/src/encoder.cpp index 4932d13..d809cd9 100644 --- a/proton-c/bindings/cpp/src/encoder.cpp +++ b/proton-c/bindings/cpp/src/encoder.cpp @@ -21,16 +21,16 @@ #include "types_internal.hpp" #include "msg.hpp" -#include <proton/annotation_key.hpp> -#include <proton/binary.hpp> -#include <proton/codec/encoder.hpp> -#include <proton/codec/data.hpp> -#include <proton/decimal.hpp> -#include <proton/message_id.hpp> -#include <proton/internal/scalar_base.hpp> -#include <proton/symbol.hpp> -#include <proton/timestamp.hpp> -#include <proton/value.hpp> +#include "proton/annotation_key.hpp" +#include "proton/binary.hpp" +#include "proton/codec/encoder.hpp" +#include "proton/codec/data.hpp" +#include "proton/decimal.hpp" +#include "proton/message_id.hpp" +#include "proton/internal/scalar_base.hpp" +#include "proton/symbol.hpp" +#include "proton/timestamp.hpp" +#include "proton/value.hpp" #include <proton/codec.h> http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/src/endpoint.cpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/src/endpoint.cpp b/proton-c/bindings/cpp/src/endpoint.cpp index 60d9355..b99ab46 100644 --- a/proton-c/bindings/cpp/src/endpoint.cpp +++ b/proton-c/bindings/cpp/src/endpoint.cpp @@ -26,9 +26,9 @@ #include "proton/link.hpp" #include "proton/session.hpp" -#include "proton/connection.h" -#include "proton/session.h" -#include "proton/link.h" +#include <proton/connection.h> +#include <proton/session.h> +#include <proton/link.h> namespace { http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/src/engine_test.cpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/src/engine_test.cpp b/proton-c/bindings/cpp/src/engine_test.cpp index 1fed4b7..681f61c 100644 --- a/proton-c/bindings/cpp/src/engine_test.cpp +++ b/proton-c/bindings/cpp/src/engine_test.cpp @@ -22,13 +22,13 @@ #include "test_dummy_container.hpp" #include "proton_bits.hpp" -#include <proton/container.hpp> -#include <proton/uuid.hpp> -#include <proton/io/connection_engine.hpp> -#include <proton/io/link_namer.hpp> -#include <proton/messaging_handler.hpp> -#include <proton/types_fwd.hpp> -#include <proton/link.hpp> +#include "proton/container.hpp" +#include "proton/uuid.hpp" +#include "proton/io/connection_engine.hpp" +#include "proton/io/link_namer.hpp" +#include "proton/messaging_handler.hpp" +#include "proton/types_fwd.hpp" +#include "proton/link.hpp" #include <deque> #include <algorithm> http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/src/error_condition.cpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/src/error_condition.cpp b/proton-c/bindings/cpp/src/error_condition.cpp index bce21a3..f200010 100644 --- a/proton-c/bindings/cpp/src/error_condition.cpp +++ b/proton-c/bindings/cpp/src/error_condition.cpp @@ -19,7 +19,7 @@ * */ #include "proton/error_condition.hpp" -#include "proton/condition.h" +#include <proton/condition.h> #include "proton_bits.hpp" http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/src/event_loop.cpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/src/event_loop.cpp b/proton-c/bindings/cpp/src/event_loop.cpp index ec10a8c..3d373c4 100644 --- a/proton-c/bindings/cpp/src/event_loop.cpp +++ b/proton-c/bindings/cpp/src/event_loop.cpp @@ -22,7 +22,7 @@ #include <proton/session.h> #include <proton/link.h> -#include <proton/event_loop.hpp> +#include "proton/event_loop.hpp" namespace proton { http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/src/handler.cpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/src/handler.cpp b/proton-c/bindings/cpp/src/handler.cpp index 9b34e2d..bacedd0 100644 --- a/proton-c/bindings/cpp/src/handler.cpp +++ b/proton-c/bindings/cpp/src/handler.cpp @@ -29,7 +29,7 @@ #include "proton_event.hpp" #include "messaging_adapter.hpp" -#include "proton/handlers.h" +#include <proton/handlers.h> #include <algorithm> http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/src/link.cpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/src/link.cpp b/proton-c/bindings/cpp/src/link.cpp index 7da346f..6a00101 100644 --- a/proton-c/bindings/cpp/src/link.cpp +++ b/proton-c/bindings/cpp/src/link.cpp @@ -25,9 +25,9 @@ #include "proton/error.hpp" #include "proton/connection.hpp" -#include "proton/connection.h" -#include "proton/session.h" -#include "proton/link.h" +#include <proton/connection.h> +#include <proton/session.h> +#include <proton/link.h> #include "container_impl.hpp" #include "contexts.hpp" http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/src/message.cpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/src/message.cpp b/proton-c/bindings/cpp/src/message.cpp index a3842d9..432553c 100644 --- a/proton-c/bindings/cpp/src/message.cpp +++ b/proton-c/bindings/cpp/src/message.cpp @@ -28,7 +28,7 @@ #include "proton/sender.hpp" #include "proton/timestamp.hpp" -#include "proton/message.h" +#include <proton/message.h> #include "msg.hpp" #include "proton_bits.hpp" http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/src/messaging_adapter.cpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/src/messaging_adapter.cpp b/proton-c/bindings/cpp/src/messaging_adapter.cpp index 4963b3c..eba6c06 100644 --- a/proton-c/bindings/cpp/src/messaging_adapter.cpp +++ b/proton-c/bindings/cpp/src/messaging_adapter.cpp @@ -33,13 +33,13 @@ #include "proton_bits.hpp" #include "proton_event.hpp" -#include "proton/connection.h" -#include "proton/delivery.h" -#include "proton/handlers.h" -#include "proton/link.h" -#include "proton/message.h" -#include "proton/session.h" -#include "proton/transport.h" +#include <proton/connection.h> +#include <proton/delivery.h> +#include <proton/handlers.h> +#include <proton/link.h> +#include <proton/message.h> +#include <proton/session.h> +#include <proton/transport.h> namespace proton { http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/src/messaging_adapter.hpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/src/messaging_adapter.hpp b/proton-c/bindings/cpp/src/messaging_adapter.hpp index 7905f6e..c12d33b 100644 --- a/proton-c/bindings/cpp/src/messaging_adapter.hpp +++ b/proton-c/bindings/cpp/src/messaging_adapter.hpp @@ -26,8 +26,8 @@ #include "proton_handler.hpp" -#include "proton/event.h" -#include "proton/reactor.h" +#include <proton/event.h> +#include <proton/reactor.h> ///@cond INTERNAL http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/src/proton_event.hpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/src/proton_event.hpp b/proton-c/bindings/cpp/src/proton_event.hpp index 1d68529..a551435 100644 --- a/proton-c/bindings/cpp/src/proton_event.hpp +++ b/proton-c/bindings/cpp/src/proton_event.hpp @@ -24,7 +24,7 @@ #include "proton/error.hpp" -#include "proton/event.h" +#include <proton/event.h> namespace proton { http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/src/proton_handler.hpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/src/proton_handler.hpp b/proton-c/bindings/cpp/src/proton_handler.hpp index 32d370d..9941396 100644 --- a/proton-c/bindings/cpp/src/proton_handler.hpp +++ b/proton-c/bindings/cpp/src/proton_handler.hpp @@ -22,7 +22,6 @@ * */ -#include "proton/export.hpp" #include "proton/internal/object.hpp" #include <vector> http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/src/receiver.cpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/src/receiver.cpp b/proton-c/bindings/cpp/src/receiver.cpp index a5a7e6e..b84722c 100644 --- a/proton-c/bindings/cpp/src/receiver.cpp +++ b/proton-c/bindings/cpp/src/receiver.cpp @@ -26,11 +26,11 @@ #include "proton_bits.hpp" #include "contexts.hpp" -#include "proton/connection.h" -#include "proton/session.h" -#include "proton/link.h" -#include "proton/event.h" -#include "proton/reactor.h" +#include <proton/connection.h> +#include <proton/session.h> +#include <proton/link.h> +#include <proton/event.h> +#include <proton/reactor.h> namespace proton { http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/src/receiver_options.cpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/src/receiver_options.cpp b/proton-c/bindings/cpp/src/receiver_options.cpp index 4e34422..807974e 100644 --- a/proton-c/bindings/cpp/src/receiver_options.cpp +++ b/proton-c/bindings/cpp/src/receiver_options.cpp @@ -24,7 +24,7 @@ #include "proton/source_options.hpp" #include "proton/target_options.hpp" -#include "proton/link.h" +#include <proton/link.h> #include "contexts.hpp" #include "container_impl.hpp" http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/src/reconnect_timer.cpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/src/reconnect_timer.cpp b/proton-c/bindings/cpp/src/reconnect_timer.cpp index 68029b8..c63f8a1 100644 --- a/proton-c/bindings/cpp/src/reconnect_timer.cpp +++ b/proton-c/bindings/cpp/src/reconnect_timer.cpp @@ -22,8 +22,8 @@ #include "proton/reconnect_timer.hpp" #include "proton/error.hpp" #include "msg.hpp" -#include "proton/types.h" -#include "proton/reactor.h" +#include <proton/types.h> +#include <proton/reactor.h> namespace proton { http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/src/scalar_test.cpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/src/scalar_test.cpp b/proton-c/bindings/cpp/src/scalar_test.cpp index ba22757..f6df832 100644 --- a/proton-c/bindings/cpp/src/scalar_test.cpp +++ b/proton-c/bindings/cpp/src/scalar_test.cpp @@ -23,11 +23,11 @@ #include "proton/error.hpp" #include "proton/internal/type_traits.hpp" -#include <proton/scalar.hpp> -#include <proton/value.hpp> -#include <proton/message_id.hpp> -#include <proton/annotation_key.hpp> -#include <proton/decimal.hpp> +#include "proton/scalar.hpp" +#include "proton/value.hpp" +#include "proton/message_id.hpp" +#include "proton/annotation_key.hpp" +#include "proton/decimal.hpp" #include <sstream> http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/src/sender.cpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/src/sender.cpp b/proton-c/bindings/cpp/src/sender.cpp index 2d956b6..380005f 100644 --- a/proton-c/bindings/cpp/src/sender.cpp +++ b/proton-c/bindings/cpp/src/sender.cpp @@ -23,9 +23,9 @@ #include "proton/sender.hpp" #include "proton/tracker.hpp" -#include "proton/delivery.h" -#include "proton/link.h" -#include "proton/types.h" +#include <proton/delivery.h> +#include <proton/link.h> +#include <proton/types.h> #include "proton_bits.hpp" #include "contexts.hpp" http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/src/session.cpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/src/session.cpp b/proton-c/bindings/cpp/src/session.cpp index bfcedc2..abb7399 100644 --- a/proton-c/bindings/cpp/src/session.cpp +++ b/proton-c/bindings/cpp/src/session.cpp @@ -20,8 +20,8 @@ */ #include "proton/session.hpp" -#include "proton/connection.h" -#include "proton/session.h" +#include <proton/connection.h> +#include <proton/session.h> #include "proton/session.hpp" #include "proton/connection.hpp" #include "proton/session_options.hpp" http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/src/session_options.cpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/src/session_options.cpp b/proton-c/bindings/cpp/src/session_options.cpp index ca66891..c8d91f2 100644 --- a/proton-c/bindings/cpp/src/session_options.cpp +++ b/proton-c/bindings/cpp/src/session_options.cpp @@ -24,7 +24,7 @@ #include "proton/connection.hpp" #include "proton/container.hpp" -#include "proton/session.h" +#include <proton/session.h> #include "messaging_adapter.hpp" #include "container_impl.hpp" http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/src/ssl.cpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/src/ssl.cpp b/proton-c/bindings/cpp/src/ssl.cpp index 62a234f..4ef1f06 100644 --- a/proton-c/bindings/cpp/src/ssl.cpp +++ b/proton-c/bindings/cpp/src/ssl.cpp @@ -22,7 +22,7 @@ #include "proton/error.hpp" #include "msg.hpp" -#include "proton/ssl.h" +#include <proton/ssl.h> namespace proton { http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/src/ssl_domain.cpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/src/ssl_domain.cpp b/proton-c/bindings/cpp/src/ssl_domain.cpp index b559daf..db27f64 100644 --- a/proton-c/bindings/cpp/src/ssl_domain.cpp +++ b/proton-c/bindings/cpp/src/ssl_domain.cpp @@ -22,7 +22,7 @@ #include "proton/error.hpp" #include "msg.hpp" -#include "proton/ssl.h" +#include <proton/ssl.h> namespace proton { http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/src/task.cpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/src/task.cpp b/proton-c/bindings/cpp/src/task.cpp index 7c0a683..b71212b 100644 --- a/proton-c/bindings/cpp/src/task.cpp +++ b/proton-c/bindings/cpp/src/task.cpp @@ -20,7 +20,7 @@ */ #include "proton/task.hpp" -#include "proton/reactor.h" +#include <proton/reactor.h> namespace proton { http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/src/terminus.cpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/src/terminus.cpp b/proton-c/bindings/cpp/src/terminus.cpp index 75ac64a..f378fdb 100644 --- a/proton-c/bindings/cpp/src/terminus.cpp +++ b/proton-c/bindings/cpp/src/terminus.cpp @@ -24,7 +24,7 @@ #include "proton_bits.hpp" #include "proton/link.hpp" -#include "proton/link.h" +#include <proton/link.h> namespace proton { http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/src/test_bits.hpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/src/test_bits.hpp b/proton-c/bindings/cpp/src/test_bits.hpp index 47643ce..6dc629d 100644 --- a/proton-c/bindings/cpp/src/test_bits.hpp +++ b/proton-c/bindings/cpp/src/test_bits.hpp @@ -20,7 +20,7 @@ */ #include "msg.hpp" -#include <proton/types.hpp> +#include "proton/types.hpp" #include <stdexcept> #include <iostream> http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/src/timestamp.cpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/src/timestamp.cpp b/proton-c/bindings/cpp/src/timestamp.cpp index 49f1ca0..2a3e8a9 100644 --- a/proton-c/bindings/cpp/src/timestamp.cpp +++ b/proton-c/bindings/cpp/src/timestamp.cpp @@ -17,7 +17,7 @@ * under the License. */ -#include <proton/timestamp.hpp> +#include "proton/timestamp.hpp" #include <proton/types.h> #include <iostream> http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/src/transfer.cpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/src/transfer.cpp b/proton-c/bindings/cpp/src/transfer.cpp index 4356f7f..7331489 100644 --- a/proton-c/bindings/cpp/src/transfer.cpp +++ b/proton-c/bindings/cpp/src/transfer.cpp @@ -25,9 +25,9 @@ #include "proton/link.hpp" #include "proton/session.hpp" -#include "proton/delivery.h" -#include "proton/link.h" -#include "proton/session.h" +#include <proton/delivery.h> +#include <proton/link.h> +#include <proton/session.h> #include "proton_bits.hpp" http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/src/transport.cpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/src/transport.cpp b/proton-c/bindings/cpp/src/transport.cpp index e6217ae..da3119e 100644 --- a/proton-c/bindings/cpp/src/transport.cpp +++ b/proton-c/bindings/cpp/src/transport.cpp @@ -25,8 +25,8 @@ #include "proton/connection.hpp" #include "proton/ssl.hpp" #include "proton/sasl.hpp" -#include "proton/transport.h" -#include "proton/error.h" +#include <proton/transport.h> +#include <proton/error.h> #include "msg.hpp" #include "proton_bits.hpp" http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/src/type_id.cpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/src/type_id.cpp b/proton-c/bindings/cpp/src/type_id.cpp index 57f950a..0108e5a 100644 --- a/proton-c/bindings/cpp/src/type_id.cpp +++ b/proton-c/bindings/cpp/src/type_id.cpp @@ -19,7 +19,7 @@ #include "types_internal.hpp" -#include <proton/type_id.hpp> +#include "proton/type_id.hpp" #include <ostream> http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/src/types_internal.hpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/src/types_internal.hpp b/proton-c/bindings/cpp/src/types_internal.hpp index c9ee7c6..ea8b6ef 100644 --- a/proton-c/bindings/cpp/src/types_internal.hpp +++ b/proton-c/bindings/cpp/src/types_internal.hpp @@ -19,9 +19,9 @@ * under the License. */ -#include <proton/internal/type_traits.hpp> -#include <proton/error.hpp> -#include <proton/binary.hpp> +#include "proton/internal/type_traits.hpp" +#include "proton/error.hpp" +#include "proton/binary.hpp" #include <sstream> ///@file http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/src/url.cpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/src/url.cpp b/proton-c/bindings/cpp/src/url.cpp index 1e9f5ae..34616bd 100644 --- a/proton-c/bindings/cpp/src/url.cpp +++ b/proton-c/bindings/cpp/src/url.cpp @@ -23,7 +23,7 @@ #include "proton/error.hpp" -#include "proton/url.h" +#include <proton/url.h> #include "proton_bits.hpp" http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/src/uuid.cpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/src/uuid.cpp b/proton-c/bindings/cpp/src/uuid.cpp index 592943d..7e0af2c 100644 --- a/proton-c/bindings/cpp/src/uuid.cpp +++ b/proton-c/bindings/cpp/src/uuid.cpp @@ -19,8 +19,8 @@ #include "types_internal.hpp" -#include <proton/uuid.hpp> -#include <proton/types_fwd.hpp> +#include "proton/uuid.hpp" +#include "proton/types_fwd.hpp" #include <cstdlib> #include <ctime> http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1a9470a2/proton-c/bindings/cpp/src/value_test.cpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/src/value_test.cpp b/proton-c/bindings/cpp/src/value_test.cpp index 8fed16e..e37b792 100644 --- a/proton-c/bindings/cpp/src/value_test.cpp +++ b/proton-c/bindings/cpp/src/value_test.cpp @@ -19,8 +19,8 @@ #include "test_bits.hpp" -#include <proton/types.hpp> -#include <proton/error.hpp> +#include "proton/types.hpp" +#include "proton/error.hpp" namespace { --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org