diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2014-01-17 20:58:18 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2014-01-17 20:58:18 +0000 |
| commit | 49c25688ad7c880826256a549e0ed4f0b37aa454 (patch) | |
| tree | 127ef30145d6176c82cb854dee733bef8dea0eb9 | |
| parent | 4cb13d096fd565ac8676b77570c2765601a93fbc (diff) | |
| download | qpid-python-49c25688ad7c880826256a549e0ed4f0b37aa454.tar.gz | |
QPID-5488: Fix Amqp protocol version printing
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1559251 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/cpp/src/qpid/framing/ProtocolVersion.cpp | 10 | ||||
| -rw-r--r-- | qpid/cpp/src/qpid/framing/ProtocolVersion.h | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/qpid/cpp/src/qpid/framing/ProtocolVersion.cpp b/qpid/cpp/src/qpid/framing/ProtocolVersion.cpp index 174fc3e65b..269b861191 100644 --- a/qpid/cpp/src/qpid/framing/ProtocolVersion.cpp +++ b/qpid/cpp/src/qpid/framing/ProtocolVersion.cpp @@ -26,7 +26,7 @@ using namespace qpid::framing; const std::string ProtocolVersion::toString() const { std::stringstream ss; - ss << major_ << "-" << minor_; + ss << unsigned(major_) << "-" << unsigned(minor_); if (major_ == 1) { if (protocol_ == SASL) ss << " (SASL)"; else if (protocol_ == TLS) ss << " (TLS)"; @@ -46,7 +46,7 @@ bool ProtocolVersion::operator==(ProtocolVersion p) const return major_ == p.major_ && minor_ == p.minor_; } -uint8_t ProtocolVersion::AMQP(0); -uint8_t ProtocolVersion::LEGACY_AMQP(1); -uint8_t ProtocolVersion::TLS(2); -uint8_t ProtocolVersion::SASL(3); +const uint8_t ProtocolVersion::AMQP(0); +const uint8_t ProtocolVersion::LEGACY_AMQP(1); +const uint8_t ProtocolVersion::TLS(2); +const uint8_t ProtocolVersion::SASL(3); diff --git a/qpid/cpp/src/qpid/framing/ProtocolVersion.h b/qpid/cpp/src/qpid/framing/ProtocolVersion.h index 309e543516..92580baf1a 100644 --- a/qpid/cpp/src/qpid/framing/ProtocolVersion.h +++ b/qpid/cpp/src/qpid/framing/ProtocolVersion.h @@ -54,10 +54,10 @@ public: QPID_COMMON_EXTERN bool operator==(ProtocolVersion p) const; QPID_COMMON_INLINE_EXTERN bool operator!=(ProtocolVersion p) const { return ! (*this == p); } - QPID_COMMON_EXTERN static uint8_t AMQP; - QPID_COMMON_EXTERN static uint8_t LEGACY_AMQP; - QPID_COMMON_EXTERN static uint8_t TLS; - QPID_COMMON_EXTERN static uint8_t SASL; + QPID_COMMON_EXTERN static const uint8_t AMQP; + QPID_COMMON_EXTERN static const uint8_t LEGACY_AMQP; + QPID_COMMON_EXTERN static const uint8_t TLS; + QPID_COMMON_EXTERN static const uint8_t SASL; }; } // namespace framing |