NO-JIRA: Small fixes to C++ binding mostly for Windows
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/75d03a84 Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/75d03a84 Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/75d03a84 Branch: refs/heads/go1 Commit: 75d03a84634a07ff687743ea0e92922d80f1b6c0 Parents: c31bf11 Author: Andrew Stitcher <[email protected]> Authored: Fri Oct 30 14:39:07 2015 -0400 Committer: Andrew Stitcher <[email protected]> Committed: Fri Oct 30 15:10:42 2015 -0400 ---------------------------------------------------------------------- proton-c/bindings/cpp/include/proton/message_id.hpp | 4 ++-- proton-c/bindings/cpp/include/proton/type_traits.hpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/75d03a84/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 212df34..a472afd 100644 --- a/proton-c/bindings/cpp/include/proton/message_id.hpp +++ b/proton-c/bindings/cpp/include/proton/message_id.hpp @@ -67,8 +67,8 @@ class message_id : public comparable<message_id> { bool operator<(const message_id& x) const { return value_ < x.value_; } friend std::ostream& operator<<(std::ostream&, const message_id&); - friend encoder& operator<<(encoder&, const message_id&); - friend decoder& operator>>(decoder&, message_id&); + friend PN_CPP_EXTERN encoder& operator<<(encoder&, const message_id&); + friend PN_CPP_EXTERN decoder& operator>>(decoder&, message_id&); private: message_id(const value& v) : value_(v) {} http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/75d03a84/proton-c/bindings/cpp/include/proton/type_traits.hpp ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/include/proton/type_traits.hpp b/proton-c/bindings/cpp/include/proton/type_traits.hpp index e9a2a48..bebf0b1 100644 --- a/proton-c/bindings/cpp/include/proton/type_traits.hpp +++ b/proton-c/bindings/cpp/include/proton/type_traits.hpp @@ -92,7 +92,7 @@ template<> struct type_id_of<amqp_string> { static const type_id value=STRING; } template<> struct type_id_of<amqp_symbol> { static const type_id value=SYMBOL; }; template <class T, class Enable=void> struct has_type_id { static const bool value = false; }; -template <class T> struct has_type_id<T, typename enable_if<type_id_of<T>::value>::type> { +template <class T> struct has_type_id<T, typename enable_if<!!type_id_of<T>::value>::type> { static const bool value = true; }; @@ -109,7 +109,7 @@ template<> struct integer_type<8, false> { typedef amqp_ulong type; }; // True if T is an integer type that does not have a type_id mapping. template <class T> struct is_unknown_integer { - static const bool value = bool((!has_type_id<T>::value) && is_integral<T>::value); + static const bool value = !has_type_id<T>::value && is_integral<T>::value; }; } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
